summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-01-15 14:47:47 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-01-15 14:50:47 +0100
commit3e8619cb1a42ccf30e7f61af5fc0e7c153a005f7 (patch)
tree7ba05f24ca36fcf646e6a36bc28b962bd1c8039c
parent928752d3a0bc3bf74724af961375934e687dfe2a (diff)
downloadptxdist-3e8619cb1a42ccf30e7f61af5fc0e7c153a005f7.tar.gz
ptxdist-3e8619cb1a42ccf30e7f61af5fc0e7c153a005f7.tar.xz
kexec-tools: version bump 2.0.20 -> 2.0.21
The patch is part of this release. Fixes building with gcc 10. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/kexec-tools-2.0.20/0001-kexec-build-multiboot2-for-i386.patch64
-rw-r--r--patches/kexec-tools-2.0.20/series4
-rw-r--r--rules/kexec-tools.make4
3 files changed, 2 insertions, 70 deletions
diff --git a/patches/kexec-tools-2.0.20/0001-kexec-build-multiboot2-for-i386.patch b/patches/kexec-tools-2.0.20/0001-kexec-build-multiboot2-for-i386.patch
deleted file mode 100644
index b2219c12c..000000000
--- a/patches/kexec-tools-2.0.20/0001-kexec-build-multiboot2-for-i386.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Mon, 18 Nov 2019 12:52:15 +1300
-Subject: [PATCH] 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 <chris.packham@alliedtelesis.co.nz>
-Signed-off-by: Simon Horman <horms@verge.net.au>
----
- kexec/arch/i386/Makefile | 2 +-
- kexec/arch/i386/kexec-x86.h | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kexec/arch/i386/Makefile b/kexec/arch/i386/Makefile
-index 105cefd60695..f4861030a4bb 100644
---- a/kexec/arch/i386/Makefile
-+++ b/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 a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h
-index 1b58c3b65cb0..0f941dfeee3f 100644
---- a/kexec/arch/i386/kexec-x86.h
-+++ b/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);
diff --git a/patches/kexec-tools-2.0.20/series b/patches/kexec-tools-2.0.20/series
deleted file mode 100644
index 49a919421..000000000
--- a/patches/kexec-tools-2.0.20/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-kexec-build-multiboot2-for-i386.patch
-# cda056db64f75b557a39e79b142865b0 - git-ptx-patches magic
diff --git a/rules/kexec-tools.make b/rules/kexec-tools.make
index e324cf152..252f06562 100644
--- a/rules/kexec-tools.make
+++ b/rules/kexec-tools.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_KEXEC_TOOLS) += kexec-tools
#
# Paths and names
#
-KEXEC_TOOLS_VERSION := 2.0.20
-KEXEC_TOOLS_MD5 := 3b3ee68064648b1b9e86ad93b1c50644
+KEXEC_TOOLS_VERSION := 2.0.21
+KEXEC_TOOLS_MD5 := 4a0bbced84e46162d8f8e2c17a0b1466
KEXEC_TOOLS := kexec-tools-$(KEXEC_TOOLS_VERSION)
KEXEC_TOOLS_SUFFIX := tar.xz
KEXEC_TOOLS_URL := $(call ptx/mirror, KERNEL, utils/kernel/kexec/$(KEXEC_TOOLS).$(KEXEC_TOOLS_SUFFIX))