Control: tags 957403 + patch
Dear maintainer, I've prepared an NMU for kexec-tools (versioned as 1:2.0.20-2.1). The diff is attached to this message. Regards.
diff -Nru kexec-tools-2.0.20/debian/changelog kexec-tools-2.0.20/debian/changelog
--- kexec-tools-2.0.20/debian/changelog 2020-03-12 16:31:02.000000000 -0300
+++ kexec-tools-2.0.20/debian/changelog 2020-07-31 14:27:55.000000000 -0300
@@ -1,3 +1,10 @@
+kexec-tools (1:2.0.20-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix build with GCC 10 (Closes: #957403)
+
+ -- Thadeu Lima de Souza Cascardo <casca...@debian.org> Fri, 31 Jul 2020 14:27:55 -0300
+
kexec-tools (1:2.0.20-2) unstable; urgency=medium
* Fix FTBFS issue on x86 (Closes: #942617)
diff -Nru kexec-tools-2.0.20/debian/patches/kexec-tools-remove-duplicated-variable-d.patch kexec-tools-2.0.20/debian/patches/kexec-tools-remove-duplicated-variable-d.patch
--- kexec-tools-2.0.20/debian/patches/kexec-tools-remove-duplicated-variable-d.patch 1969-12-31 21:00:00.000000000 -0300
+++ kexec-tools-2.0.20/debian/patches/kexec-tools-remove-duplicated-variable-d.patch 2020-07-31 14:27:36.000000000 -0300
@@ -0,0 +1,86 @@
+From: Kairui Song <kas...@redhat.com>
+Date: Wed, 29 Jan 2020 13:38:19 +0800
+X-Dgit-Generated: 1:2.0.20-2.1 2bf3cc958fc767a2868b5766a3b6ac73da019ef3
+Subject: kexec-tools: Remove duplicated variable declarations
+
+When building kexec-tools for Fedora 32, following error is observed:
+
+/usr/bin/ld: kexec/arch/x86_64/kexec-bzImage64.o:(.bss+0x0): multiple definition of `bzImage_support_efi_boot';
+kexec/arch/i386/kexec-bzImage.o:(.bss+0x0): first defined here
+
+/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm/../../fs2dt.h:33: multiple definition of `my_debug';
+kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/kexec/fs2dt.h:33: first defined here
+
+/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:68: multiple definition of `arm64_mem';
+kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:68: first defined here
+
+/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:54: multiple definition of `initrd_size';
+kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:54: first defined here
+
+/builddir/build/BUILD/kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h:53: multiple definition of `initrd_base';
+kexec/fs2dt.o:/builddir/build/BUILD/kexec-tools-2.0.20/././kexec/arch/arm64/kexec-arm64.h:53: first defined here
+
+And apparently, these variables are wrongly declared multiple times. So
+remove duplicated declaration.
+
+Signed-off-by: Kairui Song <kas...@redhat.com>
+Signed-off-by: Simon Horman <ho...@verge.net.au>
+(cherry picked from commit cc087b11462af9f971a2c090d07e8d780a867b50)
+Signed-off-by: Thadeu Lima de Souza Cascardo <casca...@canonical.com>
+
+---
+
+--- kexec-tools-2.0.20.orig/kexec/arch/arm64/kexec-arm64.h
++++ kexec-tools-2.0.20/kexec/arch/arm64/kexec-arm64.h
+@@ -50,8 +50,8 @@ int zImage_arm64_load(int argc, char **a
+ void zImage_arm64_usage(void);
+
+
+-off_t initrd_base;
+-off_t initrd_size;
++extern off_t initrd_base;
++extern off_t initrd_size;
+
+ /**
+ * struct arm64_mem - Memory layout info.
+@@ -65,7 +65,7 @@ struct arm64_mem {
+ };
+
+ #define arm64_mem_ngv UINT64_MAX
+-struct arm64_mem arm64_mem;
++extern struct arm64_mem arm64_mem;
+
+ uint64_t get_phys_offset(void);
+ uint64_t get_vp_offset(void);
+--- kexec-tools-2.0.20.orig/kexec/arch/ppc64/kexec-elf-ppc64.c
++++ kexec-tools-2.0.20/kexec/arch/ppc64/kexec-elf-ppc64.c
+@@ -44,8 +44,6 @@
+ uint64_t initrd_base, initrd_size;
+ unsigned char reuse_initrd = 0;
+ const char *ramdisk;
+-/* Used for enabling printing message from purgatory code */
+-int my_debug = 0;
+
+ int elf_ppc64_probe(const char *buf, off_t len)
+ {
+--- kexec-tools-2.0.20.orig/kexec/arch/x86_64/kexec-bzImage64.c
++++ kexec-tools-2.0.20/kexec/arch/x86_64/kexec-bzImage64.c
+@@ -42,7 +42,6 @@
+ #include <arch/options.h>
+
+ static const int probe_debug = 0;
+-int bzImage_support_efi_boot;
+
+ int bzImage64_probe(const char *buf, off_t len)
+ {
+--- kexec-tools-2.0.20.orig/kexec/fs2dt.h
++++ kexec-tools-2.0.20/kexec/fs2dt.h
+@@ -30,7 +30,7 @@ extern struct bootblock bb[1];
+
+ /* Used for enabling printing message from purgatory code
+ * Only has implemented for PPC64 */
+-int my_debug;
++extern int my_debug;
+ extern int dt_no_old_root;
+
+ void reserve(unsigned long long where, unsigned long long length);
diff -Nru kexec-tools-2.0.20/debian/patches/series kexec-tools-2.0.20/debian/patches/series
--- kexec-tools-2.0.20/debian/patches/series 2020-03-12 16:31:02.000000000 -0300
+++ kexec-tools-2.0.20/debian/patches/series 2020-07-31 14:27:36.000000000 -0300
@@ -6,3 +6,4 @@
linker-option.patch
powerpcspe_support.patch
ftbfs-i386.patch
+kexec-tools-remove-duplicated-variable-d.patch
signature.asc
Description: PGP signature
