summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2025-05-12 17:03:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-05-13 10:29:21 +0100
commitc7f33868ef41334501a8aeb9d2a0a39f677997d8 (patch)
treeacfb2a8d655896b40855ecc746a03315124c50fc
parent089df5b119472211d27b76b9be76d94b69797edc (diff)
downloadpoky-c7f33868ef41334501a8aeb9d2a0a39f677997d8.tar.gz
kexec-tools: upgrade 2.0.30 -> 2.0.31
0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch refreshed for 2.0.31 (From OE-Core rev: c89b1d383f9b485de42b4228c8146b07e3be7f81) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools/0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch8
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.31.bb (renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.30.bb)2
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch
index 8dc5fed765..5d994d9ffb 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch
@@ -1,4 +1,4 @@
1From 1a09bf71c2f541c2cfb44a00661051597bbd0b76 Mon Sep 17 00:00:00 2001 1From 0b176595ca1610037d1175e1786d1a8aff1fb43f Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 6 Aug 2024 21:42:43 -0700 3Date: Tue, 6 Aug 2024 21:42:43 -0700
4Subject: [PATCH] kexec.c: add MFD_NOEXEC_SEAL flag explicitly 4Subject: [PATCH] kexec.c: add MFD_NOEXEC_SEAL flag explicitly
@@ -18,10 +18,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
18 1 file changed, 5 insertions(+), 1 deletion(-) 18 1 file changed, 5 insertions(+), 1 deletion(-)
19 19
20diff --git a/kexec/kexec.c b/kexec/kexec.c 20diff --git a/kexec/kexec.c b/kexec/kexec.c
21index 4f51987..8f02595 100644 21index 6bf12d7..2f8e7cc 100644
22--- a/kexec/kexec.c 22--- a/kexec/kexec.c
23+++ b/kexec/kexec.c 23+++ b/kexec/kexec.c
24@@ -60,6 +60,10 @@ 24@@ -61,6 +61,10 @@
25 #define KEXEC_LOADED_PATH "/sys/kernel/kexec_loaded" 25 #define KEXEC_LOADED_PATH "/sys/kernel/kexec_loaded"
26 #define KEXEC_CRASH_LOADED_PATH "/sys/kernel/kexec_crash_loaded" 26 #define KEXEC_CRASH_LOADED_PATH "/sys/kernel/kexec_crash_loaded"
27 27
@@ -32,7 +32,7 @@ index 4f51987..8f02595 100644
32 unsigned long long mem_min = 0; 32 unsigned long long mem_min = 0;
33 unsigned long long mem_max = ULONG_MAX; 33 unsigned long long mem_max = ULONG_MAX;
34 unsigned long elfcorehdrsz = 0; 34 unsigned long elfcorehdrsz = 0;
35@@ -657,7 +661,7 @@ static int copybuf_memfd(const char *kernel_buf, size_t size) 35@@ -661,7 +665,7 @@ static int copybuf_memfd(const char *kernel_buf, size_t size)
36 { 36 {
37 int fd, count; 37 int fd, count;
38 38
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.30.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.31.bb
index 6a67427888..d824859686 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.30.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.31.bb
@@ -20,7 +20,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
20 file://0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch \ 20 file://0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch \
21 " 21 "
22 22
23SRC_URI[sha256sum] = "bb6b39bbe00099219e95ab34b25ea4348e1a95964eefc45c1e6fe32362ac9021" 23SRC_URI[sha256sum] = "ddaaa65b02b4f8aa9222586b1f26565b93a4baeffd35bcbd523f15fae7aa4897"
24 24
25inherit autotools update-rc.d systemd 25inherit autotools update-rc.d systemd
26 26