From 7c1c0de0bdb6b2ff618cbebf9e5b8070bf561562 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 1 Jan 2022 18:09:38 +0100 Subject: [PATCH] package/kexec: bump to version 2.0.23 Drop patch (already in version) https://www.spinics.net/lists/kexec/msg27693.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...move-duplicate-definition-of-ramdisk.patch | 32 ------------------- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch diff --git a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch b/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch deleted file mode 100644 index 173323bff8..0000000000 --- a/package/kexec/0001-kexec-tools-Remove-duplicate-definition-of-ramdisk.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001 -From: Petr Tesarik -Date: Mon, 26 Apr 2021 15:29:51 +0200 -Subject: kexec-tools: Remove duplicate definition of ramdisk - -The ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This -other definition is not needed and breaks build with -fno-common. - -Signed-off-by: Petr Tesarik -Signed-off-by: Simon Horman -[Retrieved from: -https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c] -Signed-off-by: Fabrice Fontaine ---- - kexec/arch/ppc/kexec-elf-ppc.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c -index ad43ad1..4a4886e 100644 ---- a/kexec/arch/ppc/kexec-elf-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-ppc.c -@@ -33,7 +33,6 @@ - static const int probe_debug = 0; - - unsigned char reuse_initrd; --const char *ramdisk; - int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *, - char *); - --- -cgit 1.2.3-1.el7 - diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 1cf860d85e..05eb9e3d02 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2 kexec-tools-2.0.22.tar.xz +sha256 aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b kexec-tools-2.0.23.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 81d35815d8..b3b4e56546 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.22 +KEXEC_VERSION = 2.0.23 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0