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/0002-systemd-solve-the-problem-of-parsing-pid-of-message.patch b/0002-systemd-solve-the-problem-of-parsing-pid-of-message.patch new file mode 100644 index 0000000000000000000000000000000000000000..919edf159d0130465639b4f2ec7caa7cbb4fcf71 --- /dev/null +++ b/0002-systemd-solve-the-problem-of-parsing-pid-of-message.patch @@ -0,0 +1,54 @@ +From c65a42ea5d2e3626adfd5d09864b2b4bdb0f27d5 Mon Sep 17 00:00:00 2001 +From: Longjun Luo +Date: Mon, 26 Dec 2022 23:53:48 +0800 +Subject: [PATCH] systemd: solve the problem of parsing pid of message + +When restore the service of Notify, need to parse +the right pid. + +Signed-off-by: Longjun Luo +--- + src/client.go | 2 +- + src/systemd.go | 9 ++++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/client.go b/src/client.go +index 2bf6875..70d5832 100644 +--- a/src/client.go ++++ b/src/client.go +@@ -79,7 +79,7 @@ func startClient(path string) { + if ret != 0 { + handleRet("restore", ret) + } +- RestoreMainPid(c.Args().Get(1)) ++ RestoreMainPid(c.Args().First()) + NotifySytemd() + SystemdReload() + return nil +diff --git a/src/systemd.go b/src/systemd.go +index 65c53bc..cae7c05 100644 +--- a/src/systemd.go ++++ b/src/systemd.go +@@ -1,11 +1,18 @@ + package main + + import ( ++ "strings" + "github.com/coreos/go-systemd/daemon" + log "github.com/sirupsen/logrus" + ) + +-func RestoreMainPid(pid string) { ++func RestoreMainPid(command string) { ++ commands := strings.Split(command, "@") ++ if (len(commands) != 2) { ++ log.Errorf("Invalid command format %s \n", command) ++ return ++ } ++ pid := commands[1] + ifSupport, err := daemon.SdNotify(false, "READY=1\nMAINPID="+pid) + if ifSupport == false || err != nil { + log.Errorf("Unable to notify systemd, support %v err %s \n", ifSupport, err) +-- +2.38.1 + diff --git a/0003-nvwa-let-nvwa-to-parse-help-h-and-remove-version-pri.patch b/0003-nvwa-let-nvwa-to-parse-help-h-and-remove-version-pri.patch new file mode 100644 index 0000000000000000000000000000000000000000..4942a8fbb18140114c85eeeab0fe31fa52845eac --- /dev/null +++ b/0003-nvwa-let-nvwa-to-parse-help-h-and-remove-version-pri.patch @@ -0,0 +1,39 @@ +From a6b0c93a80bfdfb51d92d2da0b61c520832add5c Mon Sep 17 00:00:00 2001 +From: Longjun Luo +Date: Fri, 6 Jan 2023 11:16:37 +0800 +Subject: [PATCH] nvwa: let nvwa to parse help/h and remove version print + +Signed-off-by: Longjun Luo +--- + src/client.go | 1 - + src/main.go | 2 ++ + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/client.go b/src/client.go +index 70d5832..1f0c485 100644 +--- a/src/client.go ++++ b/src/client.go +@@ -43,7 +43,6 @@ func startClient(path string) { + app := &cli.App{ + Name: "nvwa", + Usage: "a tool used for openEuler kernel update.", +- Version: "0.1", + Compiled: time.Now(), + Commands: []*cli.Command{ + { +diff --git a/src/main.go b/src/main.go +index bcb5bb4..27811ed 100644 +--- a/src/main.go ++++ b/src/main.go +@@ -9,6 +9,8 @@ var socketPath = "/run/nvwa/nvwa.socket" + func main() { + server := flag.Int("server", 0, + "set this value to 1 to start a server") ++ _ = flag.Bool("h", false, "use nvwa help to see help text") ++ _ = flag.Bool("help", false, "use nvwa help to see help text") + flag.Parse() + if *server != 0 { + startServer(socketPath) +-- +2.38.1 + diff --git a/nvwa.spec b/nvwa.spec index 0e379a2d222c6e8f5379e0e289d7c35617473085..e0a71846710aa666b9ade877ee190058e8e41f79 100644 --- a/nvwa.spec +++ b/nvwa.spec @@ -1,6 +1,6 @@ Name: nvwa Version: 0.2 -Release: 2 +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,9 +9,12 @@ 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 BuildRequires: golang >= 1.13 +BuildRequires: systemd Requires: kexec-tools criu Requires: systemd-units iptables-services iproute Requires: gcc @@ -19,7 +22,7 @@ Requires: gcc %description A tool used to automate the process of seamless update of the openEuler. -%global debug_package %{nil} +%undefine _missing_build_ids_terminate_build %prep %autosetup -n %{name}-v%{version} -p1 @@ -86,8 +89,16 @@ source /usr/share/bash-completion/completions/nvwa %{_bindir}/%{name}-pre.sh %changelog -* Thu Jul 13 2023 huajingyun - 0.2-2 +* 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 +- Solve the problem of parsing pid of message +* Thu Dec 15 2022 fushanqing - 0.2-3 +- Enable debuginfo for fix strip +* Wed Dec 14 2022 anatasluo - 0.2-2 +- Fix issues caused by ctrl-c and systemd * Fri Jul 30 2021 anatasluo - 0.2-1 - Update to 0.2 * Fri Mar 19 2021 snoweay - 0.1-3