diff mbox series

[09/20] kexec-tools: upgrade 2.0.29 -> 2.0.30

Message ID 1733788612-20933-9-git-send-email-wangmy@fujitsu.com
State Accepted, archived
Commit 68da0e1ecac6c83dd5ff942db0d9c8cb975fe806
Headers show
Series [01/20] barebox-tools: upgrade 2024.10.0 -> 2024.12.0 | expand

Commit Message

Mingyu Wang (Fujitsu) Dec. 9, 2024, 11:56 p.m. UTC 
From: Wang Mingyu <wangmy@cn.fujitsu.com>

0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch
0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch
refreshed for 2.0.30

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
 ...xec-disabled-check-if-kaslr-seed-dtb-propert.patch | 11 ++++-------
 ...-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch |  9 +++------
 .../{kexec-tools_2.0.29.bb => kexec-tools_2.0.30.bb}  |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)
 rename meta/recipes-kernel/kexec/{kexec-tools_2.0.29.bb => kexec-tools_2.0.30.bb} (97%)
diff mbox series

Patch

diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch
index ddc1519126..ee731cea4b 100644
--- a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch
+++ b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch
@@ -1,4 +1,4 @@ 
-From d48ec5e1a5fb7907520dee71b1d94045486a0c29 Mon Sep 17 00:00:00 2001
+From 9e95f8933bded10fdd664fc95492825347ec59a7 Mon Sep 17 00:00:00 2001
 From: Alexander Kamensky <alexander.kamensky42@gmail.com>
 Date: Thu, 12 Nov 2020 12:56:46 -0800
 Subject: [PATCH] arm64: kexec: disabled check if kaslr-seed dtb property was
@@ -34,10 +34,10 @@  Upstream-Status: Submitted [http://lists.infradead.org/pipermail/kexec/2020-Nove
  1 file changed, 1 insertion(+), 13 deletions(-)
 
 diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
-index ec6df4b..10238d9 100644
+index 9091f40..ea304f9 100644
 --- a/kexec/arch/arm64/kexec-arm64.c
 +++ b/kexec/arch/arm64/kexec-arm64.c
-@@ -503,7 +503,7 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
+@@ -504,7 +504,7 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
  	int len, range_len;
  	int nodeoffset;
  	int new_size;
@@ -46,7 +46,7 @@  index ec6df4b..10238d9 100644
  
  	result = fdt_check_header(dtb->buf);
  
-@@ -576,18 +576,6 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
+@@ -577,18 +577,6 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
  			return result;
  		}
  	} else {
@@ -65,6 +65,3 @@  index ec6df4b..10238d9 100644
  		/*
  		 * Invoke the getrandom system call with
  		 * GRND_NONBLOCK, to make sure we
--- 
-2.25.1
-
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 dc52981025..8dc5fed765 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 @@ 
-From a6a9e17dfeb5627f3e6f569b66f243f50f8a3645 Mon Sep 17 00:00:00 2001
+From 1a09bf71c2f541c2cfb44a00661051597bbd0b76 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Tue, 6 Aug 2024 21:42:43 -0700
 Subject: [PATCH] kexec.c: add MFD_NOEXEC_SEAL flag explicitly
@@ -18,7 +18,7 @@  Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/kexec/kexec.c b/kexec/kexec.c
-index 7c614b0..41d285d 100644
+index 4f51987..8f02595 100644
 --- a/kexec/kexec.c
 +++ b/kexec/kexec.c
 @@ -60,6 +60,10 @@
@@ -32,7 +32,7 @@  index 7c614b0..41d285d 100644
  unsigned long long mem_min = 0;
  unsigned long long mem_max = ULONG_MAX;
  unsigned long elfcorehdrsz = 0;
-@@ -655,7 +659,7 @@ static int copybuf_memfd(const char *kernel_buf, size_t size)
+@@ -657,7 +661,7 @@ static int copybuf_memfd(const char *kernel_buf, size_t size)
  {
  	int fd, count;
  
@@ -41,6 +41,3 @@  index 7c614b0..41d285d 100644
  	if (fd == -1)
  		return fd;
  
--- 
-2.25.1
-
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.30.bb
similarity index 97%
rename from meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb
rename to meta/recipes-kernel/kexec/kexec-tools_2.0.30.bb
index 9f5eb6e8c1..6a67427888 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.29.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.30.bb
@@ -20,7 +20,7 @@  SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
            file://0001-kexec.c-add-MFD_NOEXEC_SEAL-flag-explicitly.patch \
            "
 
-SRC_URI[sha256sum] = "0756dd54dab2f2a437e5d4df64b9760c3e6cf6a7d29fb296bdeeeb749f6ea28e"
+SRC_URI[sha256sum] = "bb6b39bbe00099219e95ab34b25ea4348e1a95964eefc45c1e6fe32362ac9021"
 
 inherit autotools update-rc.d systemd