diff options
Diffstat (limited to 'package/makedumpfile')
| -rw-r--r-- | package/makedumpfile/0001-PATCH-Define-PN_XNUM-if-missing.patch (renamed from package/makedumpfile/0002-PATCH-Define-PN_XNUM-if-missing.patch) | 0 | ||||
| -rw-r--r-- | package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch | 104 | ||||
| -rw-r--r-- | package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch | 35 | ||||
| -rw-r--r-- | package/makedumpfile/Config.in | 4 | ||||
| -rw-r--r-- | package/makedumpfile/makedumpfile.hash | 2 | ||||
| -rw-r--r-- | package/makedumpfile/makedumpfile.mk | 4 |
6 files changed, 41 insertions, 108 deletions
diff --git a/package/makedumpfile/0002-PATCH-Define-PN_XNUM-if-missing.patch b/package/makedumpfile/0001-PATCH-Define-PN_XNUM-if-missing.patch index 162e893cbe..162e893cbe 100644 --- a/package/makedumpfile/0002-PATCH-Define-PN_XNUM-if-missing.patch +++ b/package/makedumpfile/0001-PATCH-Define-PN_XNUM-if-missing.patch diff --git a/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch b/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch deleted file mode 100644 index aab4f70f06..0000000000 --- a/package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001 -From: Kairui Song <kasong@redhat.com> -Date: Wed, 29 Jan 2020 13:37:13 +0800 -Subject: [PATCH] Remove duplicated variable definitions - -When building on Fedora 32 (with GCC 10), following error is observed: - -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2010: multiple definition of - `crash_reserved_mem_nr'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2010: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2009: multiple definition of - `crash_reserved_mem'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2009: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1278: multiple definition of - `parallel_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1278: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1265: multiple definition of - `splitting_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1265: first defined here -... -collect2: error: ld returned 1 exit status -make: *** [Makefile:97: makedumpfile] Error 1 - -These variables are wrongly defined multiple times. So remove the -duplicated definitions. - -Signed-off-by: Kairui Song <kasong@redhat.com> -Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com> -Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net> ---- - makedumpfile.c | 8 ++++---- - makedumpfile.h | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/makedumpfile.c b/makedumpfile.c -index e290fbd..ae7336a 100644 ---- a/makedumpfile.c -+++ b/makedumpfile.c -@@ -10954,7 +10954,7 @@ check_param_for_reassembling_dumpfile(int argc, char *argv[]) - return FALSE; - - if ((info->splitting_info -- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) -+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) - == NULL) { - MSG("Can't allocate memory for splitting_info.\n"); - return FALSE; -@@ -11042,7 +11042,7 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) - return FALSE; - } - if ((info->splitting_info -- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) -+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) - == NULL) { - MSG("Can't allocate memory for splitting_info.\n"); - return FALSE; -@@ -11077,13 +11077,13 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) - - if (info->num_threads) { - if ((info->parallel_info = -- malloc(sizeof(parallel_info_t) * info->num_threads)) -+ malloc(sizeof(struct parallel_info) * info->num_threads)) - == NULL) { - MSG("Can't allocate memory for parallel_info.\n"); - return FALSE; - } - -- memset(info->parallel_info, 0, sizeof(parallel_info_t) -+ memset(info->parallel_info, 0, sizeof(struct parallel_info) - * info->num_threads); - } - -diff --git a/makedumpfile.h b/makedumpfile.h -index 68d9691..7217407 100644 ---- a/makedumpfile.h -+++ b/makedumpfile.h -@@ -1262,7 +1262,7 @@ struct splitting_info { - mdf_pfn_t end_pfn; - off_t offset_eraseinfo; - unsigned long size_eraseinfo; --} splitting_info_t; -+}; - - struct parallel_info { - int fd_memory; -@@ -1275,7 +1275,7 @@ struct parallel_info { - #ifdef USELZO - lzo_bytep wrkmem; - #endif --} parallel_info_t; -+}; - - struct ppc64_vmemmap { - unsigned long phys; -@@ -2006,8 +2006,8 @@ struct memory_range { - }; - - #define CRASH_RESERVED_MEM_NR 8 --struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; --int crash_reserved_mem_nr; -+extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; -+extern int crash_reserved_mem_nr; - - unsigned long read_vmcoreinfo_symbol(char *str_symbol); - int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size); --- -2.28.0 - diff --git a/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch b/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch new file mode 100644 index 0000000000..defc101949 --- /dev/null +++ b/package/makedumpfile/0002-makedumpfile.h-fix-build-on-sparc64.patch @@ -0,0 +1,35 @@ +From 2c132ac5e6656723821acdb0ee57b34c42851fed Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Thu, 4 Feb 2021 20:15:56 +0100 +Subject: [PATCH] makedumpfile.h: fix build on sparc64 + +Fix the following build failure on sparc64: + +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc64-buildroot-linux-gnu/9.3.0/../../../../sparc64-buildroot-linux-gnu/bin/ld: /tmp/ccylTux8.o: in function `find_kaslr_offsets': +/home/giuliobenetti/autobuild/run/instance-0/output-1/build/makedumpfile-1.6.8/makedumpfile.c:4017: undefined reference to `get_kaslr_offset' + +Fixes: + - http://autobuild.buildroot.org/results/1421f54f7599bba62c0a4bd5c65ce21c8cc7ee1a + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Upstream status: +http://lists.infradead.org/pipermail/kexec/2021-February/021996.html] +--- + makedumpfile.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/makedumpfile.h b/makedumpfile.h +index 97a5554..dfc1a77 100644 +--- a/makedumpfile.h ++++ b/makedumpfile.h +@@ -1139,6 +1139,7 @@ unsigned long long vaddr_to_paddr_sparc64(unsigned long vaddr); + #define get_machdep_info() TRUE + #define get_phys_base() get_phys_base_sparc64() + #define get_versiondep_info() get_versiondep_info_sparc64() ++#define get_kaslr_offset(X) stub_false() + #define vaddr_to_paddr(X) vaddr_to_paddr_sparc64(X) + #define paddr_to_vaddr(X) paddr_to_vaddr_general(X) + #define is_phys_addr(X) stub_true_ul(X) +-- +2.29.2 + diff --git a/package/makedumpfile/Config.in b/package/makedumpfile/Config.in index a90ccbdf3c..d5af38b598 100644 --- a/package/makedumpfile/Config.in +++ b/package/makedumpfile/Config.in @@ -4,11 +4,13 @@ config BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS default y if BR2_arm || BR2_armeb default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x default y if BR2_sparc64 -comment "makedumpfile needs a uClibc or glibc toolchain w/ wchar, dynamic library" +comment "makedumpfile needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads" depends on BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) config BR2_PACKAGE_MAKEDUMPFILE diff --git a/package/makedumpfile/makedumpfile.hash b/package/makedumpfile/makedumpfile.hash index 2ecfc5b1c5..1b2df008d2 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 cd3642dfe780d446f2dc328736bb2070007032718f5628262d5f59baf03619a4 makedumpfile-1.6.7.tar.gz +sha256 85d79b7090e9a8ce0d426795d3bc1de2858def7e12954d9bc6ae03de160b694c makedumpfile-1.6.8.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index ad63e280e8..99fb3a71c8 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,8 +4,8 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.6.7 -MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,Released-$(subst .,-,$(MAKEDUMPFILE_VERSION))) +MAKEDUMPFILE_VERSION = 1.6.8 +MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,$(MAKEDUMPFILE_VERSION)) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 MAKEDUMPFILE_LICENSE_FILES = COPYING |