From 54301c2e3517d641aa1922813f5cf842bec14e9a Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Thu, 15 May 2025 22:38:08 +0800 Subject: makedumpfile: upgrade 1.7.6 -> 1.7.7 ChangeLog: https://github.com/makedumpfile/makedumpfile/releases/tag/1.7.7 This version supports the following new kernels: - 6.12, 6.13, 6.14 Drop backport patch. (From OE-Core rev: 364e15aadcbb3ac754c2c484f7920420b4cb3138) (From OE-Core rev: f2100e704b06913805d0d6d21df0cd73c8199388) Signed-off-by: Yi Zhao Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- ...cc-15-compiling-error-too-many-arguments-.patch | 43 --------------- .../makedumpfile/makedumpfile_1.7.6.bb | 63 ---------------------- .../makedumpfile/makedumpfile_1.7.7.bb | 62 +++++++++++++++++++++ 3 files changed, 62 insertions(+), 106 deletions(-) delete mode 100644 meta/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch delete mode 100644 meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb create mode 100644 meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb diff --git a/meta/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch b/meta/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch deleted file mode 100644 index 90f1b4038b..0000000000 --- a/meta/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 73e62a08022bf8e5edad250f8c1452f0be3771a3 Mon Sep 17 00:00:00 2001 -From: Coiby Xu -Date: Thu, 23 Jan 2025 17:47:10 +0800 -Subject: [PATCH] [PATCH] fix gcc-15 compiling error: too many arguments to function eppic_init -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2340813 - -When building makekdumpfile against gcc-15, the following error is -shown, - - erase_info.c: In function ‘process_eppic_file’: - erase_info.c:2226:13: error: too many arguments to function ‘eppic_init’; expected 0, have 1 - 2226 | if (eppic_init(&eppic_cb)) { - | ^~~~~~~~~~ ~~~~~~~~~ - make: *** [Makefile:109: erase_info.o] Error 1 - -Upstream-Status: Backport [https://github.com/makedumpfile/makedumpfile/commit/73e62a08022bf8e5edad250f8c1452f0be3771a3] - -Signed-off-by: Coiby Xu -Signed-off-by: Coiby Xu ---- - erase_info.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/erase_info.c b/erase_info.c -index cbe1681..af6bfae 100644 ---- a/erase_info.c -+++ b/erase_info.c -@@ -2192,7 +2192,7 @@ process_eppic_file(char *name_config) - { - void *handle; - void (*eppic_load)(char *), (*eppic_unload)(char *); -- int (*eppic_init)(); -+ int (*eppic_init)(struct call_back *); - - /* - * Dynamically load the eppic_makedumpfile.so library. --- -2.48.1 - diff --git a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb deleted file mode 100644 index 46be13e7d0..0000000000 --- a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "VMcore extraction tool" -DESCRIPTION = "\ - This program is used to extract a subset of the memory available either \ - via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \ - images without extra uneeded information (zero pages, userspace programs, \ - etc). \ -" -HOMEPAGE = "https://github.com/makedumpfile/makedumpfile" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -LICENSE = "GPL-2.0-only" - -SRCBRANCH ?= "master" -SRCREV = "97a89484e2c960dd64933e1cea7a7248138f8a76" - -DEPENDS = "bzip2 zlib elfutils xz" -RDEPENDS:${PN}-tools = "perl ${PN}" - -# mips/rv32 would not compile. -COMPATIBLE_HOST:mipsarcho32 = "null" -COMPATIBLE_HOST:riscv32 = "null" - -PACKAGES =+ "${PN}-tools" -FILES:${PN}-tools = "${bindir}/*.pl" - -SRC_URI = "\ - git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \ - file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ - file://0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch \ -" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" - -SECTION = "base" - -# If we do not specify TARGET, makedumpfile will build for the host but use the -# target gcc. -# - -MAKEDUMPFILE_TARGET ?= "${TARGET_ARCH}" -MAKEDUMPFILE_TARGET:powerpc = "ppc" - -EXTRA_OEMAKE = "\ - LINKTYPE=static \ - TARGET=${MAKEDUMPFILE_TARGET} \ - ${PACKAGECONFIG_CONFARGS} \ -" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo" -PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy" -PACKAGECONFIG[zstd] = "USEZSTD=on,USEZSTD=off,zstd" - -do_install () { - mkdir -p ${D}/usr/bin - install -m 755 ${S}/makedumpfile ${D}/usr/bin - install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin - - mkdir -p ${D}/etc/ - install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample -} diff --git a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb new file mode 100644 index 0000000000..23fcef9569 --- /dev/null +++ b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb @@ -0,0 +1,62 @@ +SUMMARY = "VMcore extraction tool" +DESCRIPTION = "\ + This program is used to extract a subset of the memory available either \ + via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \ + images without extra uneeded information (zero pages, userspace programs, \ + etc). \ +" +HOMEPAGE = "https://github.com/makedumpfile/makedumpfile" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LICENSE = "GPL-2.0-only" + +SRCBRANCH ?= "master" +SRCREV = "e4ae6b5ee04edeeb03db89bee372904157e3378d" + +DEPENDS = "bzip2 zlib elfutils xz" +RDEPENDS:${PN}-tools = "perl ${PN}" + +# mips/rv32 would not compile. +COMPATIBLE_HOST:mipsarcho32 = "null" +COMPATIBLE_HOST:riscv32 = "null" + +PACKAGES =+ "${PN}-tools" +FILES:${PN}-tools = "${bindir}/*.pl" + +SRC_URI = "\ + git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \ + file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ +" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" + +SECTION = "base" + +# If we do not specify TARGET, makedumpfile will build for the host but use the +# target gcc. +# + +MAKEDUMPFILE_TARGET ?= "${TARGET_ARCH}" +MAKEDUMPFILE_TARGET:powerpc = "ppc" + +EXTRA_OEMAKE = "\ + LINKTYPE=static \ + TARGET=${MAKEDUMPFILE_TARGET} \ + ${PACKAGECONFIG_CONFARGS} \ +" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo" +PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy" +PACKAGECONFIG[zstd] = "USEZSTD=on,USEZSTD=off,zstd" + +do_install () { + mkdir -p ${D}/usr/bin + install -m 755 ${S}/makedumpfile ${D}/usr/bin + install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin + + mkdir -p ${D}/etc/ + install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample +} -- cgit v1.2.3-54-g00ecf