From e8d6ddaae8ba5019d629b5bb27d6a063a811e3b6 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Wed, 10 Feb 2021 23:05:13 +0100 Subject: [PATCH] kexec-tools: update to 2.0.21. --- srcpkgs/kexec-tools/patches/i686.patch | 69 -------------------------- srcpkgs/kexec-tools/template | 4 +- 2 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 srcpkgs/kexec-tools/patches/i686.patch diff --git a/srcpkgs/kexec-tools/patches/i686.patch b/srcpkgs/kexec-tools/patches/i686.patch deleted file mode 100644 index 5f96349eb886bc..00000000000000 --- a/srcpkgs/kexec-tools/patches/i686.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 2c9f26ed20a791a7df0182ba82e93abb52f5a615 Mon Sep 17 00:00:00 2001 -From: Chris Packham -Date: Mon, 18 Nov 2019 12:52:15 +1300 -Subject: kexec: build multiboot2 for i386 - -This addresses the following compilation issues when building for i386. - - kexec/arch/i386/kexec-x86.c:39:22: error: 'multiboot2_x86_probe' undeclared here (not in a function); did you mean 'multiboot_x86_probe'? - { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, - ^~~~~~~~~~~~~~~~~~~~ - multiboot_x86_probe - kexec/arch/i386/kexec-x86.c:39:44: error: 'multiboot2_x86_load' undeclared here (not in a function); did you mean 'multiboot_x86_load'? - { "multiboot2-x86", multiboot2_x86_probe, multiboot2_x86_load, - ^~~~~~~~~~~~~~~~~~~ - multiboot_x86_load - kexec/arch/i386/kexec-x86.c:40:4: error: 'multiboot2_x86_usage' undeclared here (not in a function); did you mean 'multiboot_x86_usage'? - multiboot2_x86_usage }, - ^~~~~~~~~~~~~~~~~~~~ - multiboot_x86_usage - make: *** [Makefile:114: kexec/arch/i386/kexec-x86.o] Error 1 - make: *** Waiting for unfinished jobs.... - -Signed-off-by: Chris Packham -Signed-off-by: Simon Horman ---- - https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=2c9f26ed20a791a7df0182ba82e93abb52f5a615 - kexec/arch/i386/Makefile | 2 +- - kexec/arch/i386/kexec-x86.h | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git kexec/arch/i386/Makefile kexec/arch/i386/Makefile -index 105cefd..f486103 100644 ---- kexec/arch/i386/Makefile -+++ kexec/arch/i386/Makefile -@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-x86.c - i386_KEXEC_SRCS += kexec/arch/i386/kexec-elf-rel-x86.c - i386_KEXEC_SRCS += kexec/arch/i386/kexec-bzImage.c - i386_KEXEC_SRCS += kexec/arch/i386/kexec-multiboot-x86.c -+i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c - i386_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c - i386_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c - i386_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c -@@ -14,7 +15,6 @@ i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c - - dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ - kexec/arch/i386/crashdump-x86.h \ -- kexec/arch/i386/kexec-mb2-x86.c \ - kexec/arch/i386/kexec-x86.h \ - kexec/arch/i386/x86-linux-setup.h \ - kexec/arch/i386/include/arch/options.h -diff --git kexec/arch/i386/kexec-x86.h kexec/arch/i386/kexec-x86.h -index 1b58c3b..0f941df 100644 ---- kexec/arch/i386/kexec-x86.h -+++ kexec/arch/i386/kexec-x86.h -@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, - struct kexec_info *info); - void multiboot_x86_usage(void); - -+int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, -+ struct kexec_info *info); -+void multiboot2_x86_usage(void); -+int multiboot2_x86_probe(const char *buf, off_t buf_len); -+ - int elf_x86_probe(const char *buf, off_t len); - int elf_x86_load(int argc, char **argv, const char *buf, off_t len, - struct kexec_info *info); --- -cgit 1.2.3-1.el7 - diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template index 64f8df9ae63fe2..761e5c60a9fe60 100644 --- a/srcpkgs/kexec-tools/template +++ b/srcpkgs/kexec-tools/template @@ -1,6 +1,6 @@ # Template file for 'kexec-tools' pkgname=kexec-tools -version=2.0.20 +version=2.0.21 revision=1 create_wrksrc=yes build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://kernel.org/pub/linux/utils/kernel/kexec/" distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz" -checksum=dad8077f0315445d1f6335579fc4ade222facf82a67124974c7be5303ba4f8c8 +checksum=e113142dee891638ad96e0f72cf9277b244477619470b30c41999d312e8e8702 skip_extraction="${pkgname}-${version}.tar.xz" CFLAGS="-fcommon"