summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-10-19 03:30:16 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-10-19 03:35:36 +0000
commit1a53ad556e8f1251d6feceac5c52ea1b7f05e7a6 (patch)
tree3716a2b011113ad10c87c3f072367b0ea335759f
parentUpdating vcs fields. (diff)
downloadkexec-tools-1a53ad556e8f1251d6feceac5c52ea1b7f05e7a6.tar.xz
kexec-tools-1a53ad556e8f1251d6feceac5c52ea1b7f05e7a6.zip
Adding patch from Kairui Song <kasong@redhat.com> to correct multiboot2 buliding for i386 (Closes: #942617).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/progress-linux/0001-ftbfs-i386.patch51
-rw-r--r--debian/patches/series1
2 files changed, 52 insertions, 0 deletions
diff --git a/debian/patches/progress-linux/0001-ftbfs-i386.patch b/debian/patches/progress-linux/0001-ftbfs-i386.patch
new file mode 100644
index 0000000..8e3de7e
--- /dev/null
+++ b/debian/patches/progress-linux/0001-ftbfs-i386.patch
@@ -0,0 +1,51 @@
+Author: Kairui Song <kasong@redhat.com>
+Description: Fix broken multiboot2 buliding for i386 by putting the definition
+ in the right header, also tidy up Makefile (Closes: #942617).
+
+diff -Naurp kexec-tools.orig/kexec/arch/i386/kexec-x86.h kexec-tools/kexec/arch/i386/kexec-x86.h
+--- kexec-tools.orig/kexec/arch/i386/kexec-x86.h
++++ kexec-tools/kexec/arch/i386/kexec-x86.h
+@@ -60,6 +60,11 @@ int multiboot_x86_load(int argc, char **
+ 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 -Naurp kexec-tools.orig/kexec/arch/i386/Makefile kexec-tools/kexec/arch/i386/Makefile
+--- kexec-tools.orig/kexec/arch/i386/Makefile
++++ kexec-tools/kexec/arch/i386/Makefile
+@@ -7,6 +7,7 @@ i386_KEXEC_SRCS += kexec/arch/i386/kexec
+ 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/crash
+
+ 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 -Naurp kexec-tools.orig/kexec/arch/x86_64/kexec-x86_64.h kexec-tools/kexec/arch/x86_64/kexec-x86_64.h
+--- kexec-tools.orig/kexec/arch/x86_64/kexec-x86_64.h
++++ kexec-tools/kexec/arch/x86_64/kexec-x86_64.h
+@@ -33,9 +33,4 @@ int bzImage64_load(int argc, char **argv
+ struct kexec_info *info);
+ void bzImage64_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);
+-
+ #endif /* KEXEC_X86_64_H */
diff --git a/debian/patches/series b/debian/patches/series
index 1029313..1ed11df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ add_debian_readme.patch
coldreboot.patch
linker-option.patch
powerpcspe_support.patch
+progress-linux/0001-ftbfs-i386.patch