Skip to contentSkip to conversation

package/makedumpfile: new package

PATCH Superseded Alexander Egorenkov 2 participants 7 messages Aug 31, 2020 – Sep 5, 2020

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Alexander Egorenkov

author
#0 lore raw

PATCH v3 1/1 package/makedumpfile: new package

Signed-off-by Alexander Egorenkov <[email protected]>
---
 DEVELOPERS                                    |   3 +
 package/Config.in                             |   1 +
 ...move-duplicated-variable-definitions.patch | 103 ++++++++++++++++++
 package/makedumpfile/Config.in                |  18 +++
 package/makedumpfile/makedumpfile.hash        |   3 +
 package/makedumpfile/makedumpfile.mk          |  28 +++++
 6 files changed, 156 insertions(+)
 create mode 100644 package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch
 create mode 100644 package/makedumpfile/Config.in
 create mode 100644 package/makedumpfile/makedumpfile.hash
 create mode 100644 package/makedumpfile/makedumpfile.mk
DEVELOPERS +3 -0
index 3c3dcda859..18e7a68665 100644
@@ -137,6 +137,9 @@ F:	package/fastd/
 F:	package/libuecc/
 F:	package/putty/
 
+N:	Alexander Egorenkov <[email protected]>
+F:	package/makedumpfile/
+
 N:	Alexander Kurz <[email protected]>
 F:	package/minimodem/
package/Config.in +1 -0
index d7e79f4795..10cb1f94d1 100644
@@ -2374,6 +2374,7 @@ menu "System tools"
 	source "package/kvmtool/Config.in"
 	source "package/libostree/Config.in"
 	source "package/lxc/Config.in"
+	source "package/makedumpfile/Config.in"
 	source "package/mender/Config.in"
 	source "package/mender-grubenv/Config.in"
 	source "package/mfoc/Config.in"
package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch new file +103 -0

103 lines not on this page · raw message

package/makedumpfile/Config.in new file +18 -0
new file mode 100644
index 0000000000..1a9016a766
@@ -0,0 +1,18 @@
+comment "makedumpfile needs a uClibc or glibc toolchain w/ wchar, dynamic library"
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
+
+config BR2_PACKAGE_MAKEDUMPFILE
+	bool "makedumpfile"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_STATIC_LIBS # dlopen
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_ELFUTILS
+	select BR2_PACKAGE_XZ
+	select BR2_PACKAGE_ZLIB
+	help
+	  Makes a small dumpfile of kdump.
+
+	  https://github.com/makedumpfile/makedumpfile
package/makedumpfile/makedumpfile.hash new file +3 -0
new file mode 100644
index 0000000000..2ecfc5b1c5
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256  cd3642dfe780d446f2dc328736bb2070007032718f5628262d5f59baf03619a4  makedumpfile-1.6.7.tar.gz
+sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
package/makedumpfile/makedumpfile.mk new file +28 -0
new file mode 100644
index 0000000000..1876e1158a
@@ -0,0 +1,28 @@
+################################################################################
+#
+# makedumpfile
+#
+################################################################################
+
+MAKEDUMPFILE_VERSION = 1.6.7
+MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,Released-$(subst .,-,$(MAKEDUMPFILE_VERSION)))
+MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib
+MAKEDUMPFILE_LICENSE = GPL-2.0
+MAKEDUMPFILE_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_LZO),y)
+MAKEDUMPFILE_DEPENDENCIES += lzo
+MAKEDUMPFILE_MAKE_OPTS += USELZO=on
+endif
+
+define MAKEDUMPFILE_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		TARGET=$(BR2_ARCH) LINKTYPE=dynamic
+endef
+
+define MAKEDUMPFILE_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \
+		DESTDIR="$(TARGET_DIR)"
+endef
+
+$(eval $(generic-package))
Signature · 1 line
2.28.0
#1 lore raw

PATCH v3 1/1 package/makedumpfile: new package

Hello Aleksander,

Quoted 13 lines · On Mon, 31 Aug 2020 13:12:26 +0200 Alexander Egorenkov…
Signed-off-by Alexander Egorenkov <[email protected]>
---
 DEVELOPERS                                    |   3 +
 package/Config.in                             |   1 +
 ...move-duplicated-variable-definitions.patch | 103 ++++++++++++++++++
 package/makedumpfile/Config.in                |  18 +++
 package/makedumpfile/makedumpfile.hash        |   3 +
 package/makedumpfile/makedumpfile.mk          |  28 +++++
 6 files changed, 156 insertions(+)
 create mode 100644 package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch
 create mode 100644 package/makedumpfile/Config.in
 create mode 100644 package/makedumpfile/makedumpfile.hash
 create mode 100644 package/makedumpfile/makedumpfile.mk

Thanks for this new iteration. The patch now looks good, with a small exception below. However, the main issue is that it doesn't build. The following configuration:

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2020.02.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_MAKEDUMPFILE=y
# BR2_TARGET_ROOTFS_TAR is not set

fails with:

elf_info.c: In function ?get_elf64_phnum?:
elf_info.c:1050:23: error: ?PN_XNUM? undeclared (first use in this function)

  if (ehdr->e_phnum == PN_XNUM) {
                       ^

elf_info.c:1050:23: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:90: elf_info.o] Error 1

PN_XNUM is defined in libelf/elf.h in the elfutils code base, but it seems like this header file is only installed if elfutils is built with --enable-install-elfh. However, I am not sure what would be the impact of installing elf.h. Indeed, the kernel headers also have an elf.h file in usr/include/linux/elf.h.

Could you have a look into this ?

package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch line 4

Quoted 10 lines
package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch new file +4 -0
new file mode 100644
index 0000000000..0255de796e
@@ -0,0 +1,103 @@
+From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001
+From: Kairui Song <[email protected]>
+Date: Wed, 29 Jan 2020 13:37:13 +0800
+Subject: [PATCH 1/1] [PATCH] Remove duplicated variable definitions

[PATCH 1/1] shouldn't be there, it should be just [PATCH]. This is verified by "make check-package" in Buildroot.

Quoted 9 lines
package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch new file +9 -0
+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

package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch line 24

Quoted 10 lines
package/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch new file +10 -0
+ `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 <[email protected]>
+Signed-off-by: Kazuhito Hagio <[email protected]>

Minor nit: we need you to add your own Signed-off-by, right after the other Signed-off-by that are already there.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#2 lore raw

PATCH v3 1/1 package/makedumpfile: new package

Quoted 9 lines

elf_info.c: In function ?get_elf64_phnum?:
elf_info.c:1050:23: error: ?PN_XNUM? undeclared (first use in this function)

  if (ehdr->e_phnum == PN_XNUM) {
                       ^

elf_info.c:1050:23: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:90: elf_info.o] Error 1

Quoted 7 lines

PN_XNUM is defined in libelf/elf.h in the elfutils code base, but it seems like this header file is only installed if elfutils is built with --enable-install-elfh. However, I am not sure what would be the impact of installing elf.h. Indeed, the kernel headers also have an elf.h file in usr/include/linux/elf.h.

Could you have a look into this ?

Hmm, i checked the usr/include/linux/elf.h and it defines PN_XNUM but makedumpfile doesn't include this one and takes the one from glibc which is much bigger but doesn't contain this define, unfortunately. One option would be to patch makedumpfile and define PN_XNUM if it not yet defined, not sure whether this the way you want to go ? At least we wouldn't possibly break any other packages. What do you think ?
This is just stupid, why would elfutils override glibc's elf.h, sigh.

Thanks for feedback
Regards
Alex

author
#3 lore raw

PATCH v3 1/1 package/makedumpfile: new package

Quoted 24 lines · Alexander Egorenkov
Quoted 7 lines

elf_info.c: In function ?get_elf64_phnum?:
elf_info.c:1050:23: error: ?PN_XNUM? undeclared (first use in this function)

  if (ehdr->e_phnum == PN_XNUM) {
                       ^

elf_info.c:1050:23: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [Makefile:90: elf_info.o] Error 1

Quoted 7 lines

PN_XNUM is defined in libelf/elf.h in the elfutils code base, but it seems like this header file is only installed if elfutils is built with --enable-install-elfh. However, I am not sure what would be the impact of installing elf.h. Indeed, the kernel headers also have an elf.h file in usr/include/linux/elf.h.

Could you have a look into this ?

Hmm, i checked the usr/include/linux/elf.h and it defines PN_XNUM but makedumpfile doesn't include this one and takes the one from glibc which is much bigger but doesn't contain this define, unfortunately. One option would be to patch makedumpfile and define PN_XNUM if it not yet defined, not sure whether this the way you want to go ? At least we wouldn't possibly break any other packages. What do you think ?
This is just stupid, why would elfutils override glibc's elf.h, sigh.

Quoted 3 lines

Thanks for feedback
Regards
Alex

I checked glibc and it defines the PN_XNUM constant, it seems that uClibc doesn't. Another possible solution would be to make makedumpfile depend on glibc, what do you think ? That would mean no uClibc support for this package.

Regards
Alex

#4 lore raw

PATCH v3 1/1 package/makedumpfile: new package

Hello,

Quoted 9 lines · On Sat, 05 Sep 2020 18:03:22 +0200 Alexander Egorenkov…
Quoted 8 lines

Hmm, i checked the usr/include/linux/elf.h and it defines PN_XNUM but makedumpfile doesn't include this one and takes the one from glibc which is much bigger but doesn't contain this define, unfortunately. One option would be to patch makedumpfile and define PN_XNUM if it not yet defined, not sure whether this the way you want to go ? At least we wouldn't possibly break any other packages. What do you think ?
This is just stupid, why would elfutils override glibc's elf.h, sigh.

Quoted 4 lines

I checked glibc and it defines the PN_XNUM constant, it seems that uClibc doesn't. Another possible solution would be to make makedumpfile depend on glibc, what do you think ? That would mean no uClibc support for this package.

Indeed, I hadn't noticed that glibc and musl define PN_XNUM, but not uClibc. Good catch.

I guess the simplest then is to do what OpenSuse is doing:
https://build.opensuse.org/package/view_file/Kernel:kdump/makedumpfile/makedumpfile-PN_XNUM.patch?expand=1.
I had already seen it, found it not a great solution, but it's indeed the simplest.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#5 lore raw

PATCH v3 1/1 package/makedumpfile: new package

Quoted 8 lines

Indeed, I hadn't noticed that glibc and musl define PN_XNUM, but not uClibc. Good catch.

I guess the simplest then is to do what OpenSuse is doing:
https://build.opensuse.org/package/view_file/Kernel:kdump/makedumpfile/makedumpfile-PN_XNUM.patch?expand=1.
I had already seen it, found it not a great solution, but it's indeed the simplest.

Yeah, i also saw that patch.
Added.

Sending the next version of the package.

Thanks for feedback
Regards
Alex

author
#6 lore raw

PATCH v3 1/1 package/makedumpfile: new package

In reply to Thomas Petazzoni
Quoted 4 lines

[PATCH 1/1] shouldn't be there, it should be just [PATCH]. This is verified by "make check-package" in Buildroot.

Fixed. I didn't want to touch it because it came from upstream. Hmm, i run 'make check-package' but it didn't catch it, but the check found trailing spaces in makedumpfile/Config.in :)

Quoted 3 lines

Minor nit: we need you to add your own Signed-off-by, right after the other Signed-off-by that are already there.

Fixed.

Thanks for feedback
Regards
Alex