summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2025-05-15 22:38:08 +0800
committerSteve Sakoman <steve@sakoman.com>2025-05-23 08:42:33 -0700
commit54301c2e3517d641aa1922813f5cf842bec14e9a (patch)
treed28ffdca7c1715e316f138d68a39ef5d2f30c27f
parent9d251db72285b3ca4a94d713c09ea055d20f7068 (diff)
downloadpoky-54301c2e3517d641aa1922813f5cf842bec14e9a.tar.gz
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 <yi.zhao@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch43
-rw-r--r--meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb (renamed from meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb)3
2 files changed, 1 insertions, 45 deletions
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 @@
1From 73e62a08022bf8e5edad250f8c1452f0be3771a3 Mon Sep 17 00:00:00 2001
2From: Coiby Xu <coxu@redhat.com>
3Date: Thu, 23 Jan 2025 17:47:10 +0800
4Subject: [PATCH] [PATCH] fix gcc-15 compiling error: too many arguments to function eppic_init
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2340813
10
11When building makekdumpfile against gcc-15, the following error is
12shown,
13
14 erase_info.c: In function ‘process_eppic_file’:
15 erase_info.c:2226:13: error: too many arguments to function ‘eppic_init’; expected 0, have 1
16 2226 | if (eppic_init(&eppic_cb)) {
17 | ^~~~~~~~~~ ~~~~~~~~~
18 make: *** [Makefile:109: erase_info.o] Error 1
19
20Upstream-Status: Backport [https://github.com/makedumpfile/makedumpfile/commit/73e62a08022bf8e5edad250f8c1452f0be3771a3]
21
22Signed-off-by: Coiby Xu <coxu@redhat.com>
23Signed-off-by: Coiby Xu <coiby.xu@gmail.com>
24---
25 erase_info.c | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/erase_info.c b/erase_info.c
29index cbe1681..af6bfae 100644
30--- a/erase_info.c
31+++ b/erase_info.c
32@@ -2192,7 +2192,7 @@ process_eppic_file(char *name_config)
33 {
34 void *handle;
35 void (*eppic_load)(char *), (*eppic_unload)(char *);
36- int (*eppic_init)();
37+ int (*eppic_init)(struct call_back *);
38
39 /*
40 * Dynamically load the eppic_makedumpfile.so library.
41--
422.48.1
43
diff --git a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb
index 46be13e7d0..23fcef9569 100644
--- a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb
+++ b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
11LICENSE = "GPL-2.0-only" 11LICENSE = "GPL-2.0-only"
12 12
13SRCBRANCH ?= "master" 13SRCBRANCH ?= "master"
14SRCREV = "97a89484e2c960dd64933e1cea7a7248138f8a76" 14SRCREV = "e4ae6b5ee04edeeb03db89bee372904157e3378d"
15 15
16DEPENDS = "bzip2 zlib elfutils xz" 16DEPENDS = "bzip2 zlib elfutils xz"
17RDEPENDS:${PN}-tools = "perl ${PN}" 17RDEPENDS:${PN}-tools = "perl ${PN}"
@@ -26,7 +26,6 @@ FILES:${PN}-tools = "${bindir}/*.pl"
26SRC_URI = "\ 26SRC_URI = "\
27 git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \ 27 git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \
28 file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ 28 file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
29 file://0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch \
30" 29"
31 30
32S = "${WORKDIR}/git" 31S = "${WORKDIR}/git"