diff options
| author | Khem Raj <raj.khem@gmail.com> | 2025-03-19 01:15:48 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-19 12:09:06 +0000 |
| commit | a6b8c0c196afa8881d0327010fc5bc76f41c170f (patch) | |
| tree | bc5a139b804d8af50092b8b9ff252992c6307bcf | |
| parent | 6bca4852a40e9ec63c49360fec1965c7db623306 (diff) | |
| download | poky-a6b8c0c196afa8881d0327010fc5bc76f41c170f.tar.gz | |
makedumpfile: Fix build with GCC-15
fix gcc-15 compiling error: too many arguments to function eppic_init
(From OE-Core rev: 3bd6bbd77e8ceb068baeffd7670eb51efd52d917)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch | 43 | ||||
| -rw-r--r-- | meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb | 1 |
2 files changed, 44 insertions, 0 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 new file mode 100644 index 0000000000..90f1b4038b --- /dev/null +++ b/meta/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-fix-gcc-15-compiling-error-too-many-arguments-.patch | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | From 73e62a08022bf8e5edad250f8c1452f0be3771a3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Coiby Xu <coxu@redhat.com> | ||
| 3 | Date: Thu, 23 Jan 2025 17:47:10 +0800 | ||
| 4 | Subject: [PATCH] [PATCH] fix gcc-15 compiling error: too many arguments to function eppic_init | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2340813 | ||
| 10 | |||
| 11 | When building makekdumpfile against gcc-15, the following error is | ||
| 12 | shown, | ||
| 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 | |||
| 20 | Upstream-Status: Backport [https://github.com/makedumpfile/makedumpfile/commit/73e62a08022bf8e5edad250f8c1452f0be3771a3] | ||
| 21 | |||
| 22 | Signed-off-by: Coiby Xu <coxu@redhat.com> | ||
| 23 | Signed-off-by: Coiby Xu <coiby.xu@gmail.com> | ||
| 24 | --- | ||
| 25 | erase_info.c | 2 +- | ||
| 26 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 27 | |||
| 28 | diff --git a/erase_info.c b/erase_info.c | ||
| 29 | index 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 | -- | ||
| 42 | 2.48.1 | ||
| 43 | |||
diff --git a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb index 21847ece6b..46be13e7d0 100644 --- a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb +++ b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.6.bb | |||
| @@ -26,6 +26,7 @@ FILES:${PN}-tools = "${bindir}/*.pl" | |||
| 26 | SRC_URI = "\ | 26 | SRC_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 \ | ||
| 29 | " | 30 | " |
| 30 | 31 | ||
| 31 | S = "${WORKDIR}/git" | 32 | S = "${WORKDIR}/git" |
