diff --git a/0001-ignore-pin-memory-init-in-x86.patch b/0001-ignore-pin-memory-init-in-x86.patch new file mode 100644 index 0000000000000000000000000000000000000000..24f531942ada85c3c16d291913f7427bd2c0eeb6 --- /dev/null +++ b/0001-ignore-pin-memory-init-in-x86.patch @@ -0,0 +1,39 @@ +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 + +Signed-off-by: hejingxian +--- + misc/nvwa-pre.sh | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/misc/nvwa-pre.sh b/misc/nvwa-pre.sh +index 69f6de9..18960e7 100644 +--- a/misc/nvwa-pre.sh ++++ b/misc/nvwa-pre.sh +@@ -1,6 +1,6 @@ + #!/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 + fi + + # 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 + grep -q "Persistent Memory" /proc/iomem || exit 0 +-- +2.20.1.windows.1 + diff --git a/nvwa.spec b/nvwa.spec index f22bf1a26337f51c87cdbfe4e9ce3745c19acc40..0c12b11dd4d2ca3a2606c65b17843d9a94e206ea 100644 --- a/nvwa.spec +++ b/nvwa.spec @@ -7,6 +7,8 @@ License: MulanPSL-2.0 and Apache-2.0 and MIT and MPL-2.0 URL: https://gitee.com/openeuler/nvwa Source: %{name}-v%{version}.tar.gz +Patch1: 0001-ignore-pin-memory-init-in-x86.patch + BuildRequires: golang >= 1.13 Requires: kexec-tools criu Requires: systemd-units iptables-services iproute @@ -18,7 +20,7 @@ A tool used to automate the process of seamless update of the openEuler. %global debug_package %{nil} %prep -%autosetup -n %{name}-v%{version} +%autosetup -n %{name}-v%{version} -p1 %build