From cf35c16d712ee500bdfa2fb38f1586408426653d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 20 Dec 2019 17:23:51 +0100 Subject: kexec-tools: update to 2.0.20 Add a patch that restores missing declarations for 32 bit x86 builds. (From OE-Core rev: 3c18dad4035b1f4ba36f4a618f2fee2efe2e8895) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...07-kexec-un-break-the-build-on-32-bit-x86.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch (limited to 'meta/recipes-kernel/kexec/kexec-tools') diff --git a/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch b/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch new file mode 100644 index 0000000000..b91608e52b --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/0007-kexec-un-break-the-build-on-32-bit-x86.patch @@ -0,0 +1,42 @@ +From d294c5039753a36506949ba5dc782a4c0b307b74 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 20 Dec 2019 17:21:08 +0100 +Subject: [PATCH] kexec: un-break the build on 32 bit x86 + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + kexec/arch/i386/Makefile | 1 + + kexec/arch/i386/kexec-x86.h | 4 ++++ + 2 files changed, 5 insertions(+) + +diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile +index 105cefd..25df57a 100644 +--- a/kexec/arch/i386/Makefile ++++ b/kexec/arch/i386/Makefile +@@ -11,6 +11,7 @@ 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 + i386_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c ++i386_KEXEC_SRCS += kexec/arch/i386/kexec-mb2-x86.c + + dist += kexec/arch/i386/Makefile $(i386_KEXEC_SRCS) \ + kexec/arch/i386/crashdump-x86.h \ +diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h +index 1b58c3b..d6b10c0 100644 +--- a/kexec/arch/i386/kexec-x86.h ++++ b/kexec/arch/i386/kexec-x86.h +@@ -56,9 +56,13 @@ struct arch_options_t { + }; + + int multiboot_x86_probe(const char *buf, off_t len); ++int multiboot2_x86_probe(const char *buf, off_t len); + int multiboot_x86_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info); ++int multiboot2_x86_load(int argc, char **argv, const char *buf, off_t len, ++ struct kexec_info *info); + void multiboot_x86_usage(void); ++void multiboot2_x86_usage(void); + + int elf_x86_probe(const char *buf, off_t len); + int elf_x86_load(int argc, char **argv, const char *buf, off_t len, -- cgit v1.2.3-54-g00ecf