diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-10 20:39:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-11 17:09:16 +0000 |
commit | 3cf772cfa6899943d6cf86047630ddc4bb2b6268 (patch) | |
tree | bcf858499bac5fdddd40653516138821de86862e /meta/recipes-kernel | |
parent | 33898b06dfab198a2f88f46b9205c429a36ad207 (diff) | |
download | poky-3cf772cfa6899943d6cf86047630ddc4bb2b6268.tar.gz |
kexec-tools: update 2.0.22 -> 2.0.23
Drop patch as problem fixed upstream.
(From OE-Core rev: ed0984fe7888e971008d4bb6be0fe62de7aeacdc)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch | 23 | ||||
-rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb (renamed from meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb) | 3 |
2 files changed, 1 insertions, 25 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch deleted file mode 100644 index 6aeebc3939..0000000000 --- a/meta/recipes-kernel/kexec/kexec-tools/0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From ba2fb5baf6b0a8c882ac32301dd7a8d16de0dcf6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sun, 27 Dec 2020 23:39:29 +0100 | ||
4 | Subject: [PATCH] kexec/arch/ppc/kexec-ppc.c: correct double definition error | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | kexec/arch/ppc/kexec-ppc.c | 1 - | ||
10 | 1 file changed, 1 deletion(-) | ||
11 | |||
12 | diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c | ||
13 | index 03bec36..5b3e244 100644 | ||
14 | --- a/kexec/arch/ppc/kexec-ppc.c | ||
15 | +++ b/kexec/arch/ppc/kexec-ppc.c | ||
16 | @@ -35,7 +35,6 @@ unsigned long long initrd_base = 0, initrd_size = 0; | ||
17 | unsigned long long ramdisk_base = 0, ramdisk_size = 0; | ||
18 | unsigned int rtas_base, rtas_size; | ||
19 | int max_memory_ranges; | ||
20 | -const char *ramdisk; | ||
21 | |||
22 | /* | ||
23 | * Reads the #address-cells and #size-cells on this platform. | ||
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb index 95ff5e6ef8..22a9498a7b 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.23.bb | |||
@@ -19,10 +19,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz | |||
19 | file://0005-Disable-PIE-during-link.patch \ | 19 | file://0005-Disable-PIE-during-link.patch \ |
20 | file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \ | 20 | file://0007-kexec-un-break-the-build-on-32-bit-x86.patch \ |
21 | file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ | 21 | file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ |
22 | file://0001-kexec-arch-ppc-kexec-ppc.c-correct-double-definition.patch \ | ||
23 | " | 22 | " |
24 | 23 | ||
25 | SRC_URI[sha256sum] = "40623d4321be2865ef9ea2cd6ec998d31dcf93d0f74353cbd3aa06d8821e3e41" | 24 | SRC_URI[sha256sum] = "c7dcc59f5b66004d9d91264324e20e0387ea263dbb449708fbf84a4e5ff7decc" |
26 | 25 | ||
27 | inherit autotools update-rc.d systemd | 26 | inherit autotools update-rc.d systemd |
28 | 27 | ||