kexec-tools: upgrade 2.0.23 -> 2.0.24

refresh 0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch

(From OE-Core rev: 633247f8b84aeb2bd109567bb469a4de4cf53804)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
wangmy
2022-04-19 18:31:20 +08:00
committed by Richard Purdie
parent 2e269144c9
commit 1c688b1049
2 changed files with 12 additions and 9 deletions

View File

@@ -33,20 +33,20 @@ Upstream-Status: Submitted [http://lists.infradead.org/pipermail/kexec/2020-Nove
kexec/arch/arm64/kexec-arm64.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
Index: kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.c
===================================================================
--- kexec-tools-2.0.20.orig/kexec/arch/arm64/kexec-arm64.c
+++ kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.c
@@ -428,7 +428,7 @@ static int setup_2nd_dtb(struct dtb *dtb
diff --git a/kexec/arch/arm64/kexec-arm64.c b/kexec/arch/arm64/kexec-arm64.c
index ec6df4b..10238d9 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)
int len, range_len;
int nodeoffset;
int new_size;
- int result, kaslr_seed;
+ int result;
- int i, result, kaslr_seed;
+ int i, result;
result = fdt_check_header(dtb->buf);
@@ -499,18 +499,6 @@ static int setup_2nd_dtb(struct dtb *dtb
@@ -576,18 +576,6 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)
return result;
}
} else {
@@ -65,3 +65,6 @@ Index: kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.c
/*
* Invoke the getrandom system call with
* GRND_NONBLOCK, to make sure we
--
2.25.1

View File

@@ -20,7 +20,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz
file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \
"
SRC_URI[sha256sum] = "c7dcc59f5b66004d9d91264324e20e0387ea263dbb449708fbf84a4e5ff7decc"
SRC_URI[sha256sum] = "1ff9137327aeac3b2ab922a71bc6eb4655571a0ff77c071cb92783a9a59d4d26"
inherit autotools update-rc.d systemd