diff --git a/0001-ignore-pin-memory-init-in-x86.patch b/0001-ignore-pin-memory-init-in-oe24.03.patch similarity index 37% rename from 0001-ignore-pin-memory-init-in-x86.patch rename to 0001-ignore-pin-memory-init-in-oe24.03.patch index 24f531942ada85c3c16d291913f7427bd2c0eeb6..c5a1523c7166ac997df291eca0f0d6997b8aeffc 100644 --- a/0001-ignore-pin-memory-init-in-x86.patch +++ b/0001-ignore-pin-memory-init-in-oe24.03.patch @@ -1,39 +1,38 @@ -From fe0b709d2fe196097796b3b964803226c6ca9578 Mon Sep 17 00:00:00 2001 -From: hejingxian -Date: Thu, 1 Dec 2022 23:02:21 +0800 -Subject: [PATCH] ignore pin memory init in x86 +From ef3b67cdd08819699eb43bb06c4f63b34eba477a Mon Sep 17 00:00:00 2001 +From: renoseven +Date: Wed, 15 May 2024 15:34:35 +0800 +Subject: [PATCH] ignore pin memory init in oe24.03 -Signed-off-by: hejingxian +Signed-off-by: renoseven --- - misc/nvwa-pre.sh | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + misc/nvwa-pre.sh | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/misc/nvwa-pre.sh b/misc/nvwa-pre.sh -index 69f6de9..18960e7 100644 +index 69f6de9..61535bc 100644 --- a/misc/nvwa-pre.sh +++ b/misc/nvwa-pre.sh -@@ -1,6 +1,6 @@ +@@ -1,7 +1,5 @@ #!/bin/bash -set -e -+#set -e - +- # 1. Increase last pid by 2011 from saved last pid. # So services restoring may use its old pid. -@@ -32,8 +32,11 @@ else + LAST_PID_FILE="/proc/sys/kernel/ns_last_pid" +@@ -31,11 +29,7 @@ else + rm -rf "${LAST_PID_SAVE_FILE}" fi - # 2. Enable Pin Memory +-# 2. Enable Pin Memory -modprobe pin_memory -/usr/bin/nvwa-pin --init-pagemap-read -+is_x86=`uname -a | grep x86` -+if [[ $is_x86"X" == "X" ]]; then -+ modprobe pin_memory -+ /usr/bin/nvwa-pin --init-pagemap-read -+fi - - # 3. Enable PMEM +- +-# 3. Enable PMEM ++# 2. Enable PMEM grep -q "Persistent Memory" /proc/iomem || exit 0 + modprobe nd_e820 + -- -2.20.1.windows.1 +2.34.1 diff --git a/nvwa.spec b/nvwa.spec index 08fb5fbfecf8c67c42fdc0c77fecfac6ccf067c9..e0a71846710aa666b9ade877ee190058e8e41f79 100644 --- a/nvwa.spec +++ b/nvwa.spec @@ -1,6 +1,6 @@ Name: nvwa Version: 0.2 -Release: 5 +Release: 6 Summary: a tool used for openEuler kernel update License: MulanPSL-2.0 and Apache-2.0 and MIT and MPL-2.0 @@ -9,7 +9,7 @@ Source: %{name}-v%{version}.tar.gz #source1 version sys@v0.0.0-20220908164124-27713097b956 Source1: sys.tar.gz -Patch1: 0001-ignore-pin-memory-init-in-x86.patch +Patch1: 0001-ignore-pin-memory-init-in-oe24.03.patch Patch2: 0002-systemd-solve-the-problem-of-parsing-pid-of-message.patch Patch3: 0003-nvwa-let-nvwa-to-parse-help-h-and-remove-version-pri.patch @@ -89,6 +89,8 @@ source /usr/share/bash-completion/completions/nvwa %{_bindir}/%{name}-pre.sh %changelog +* Wed May 15 2024 renoseven - 0.2-6 +- disable pin memory in oe24.03 * Thu Jul 13 2023 huajingyun - 0.2-5 - add loong64 support * Tue Jan 03 2023 anatasluo - 0.2-4