@@ -1,6 +1,6 @@
-From 8d200d7cd700f93333353632e7dce48cf4b871fe Mon Sep 17 00:00:00 2001
+From b19405a555473b6045cea94f77ac14388085c960 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com>
-Date: Sun, 24 Apr 2022 17:25:33 +0800
+Date: Tue, 17 Nov 2026 12:25:17 +0000
Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
* Create alias for target such as powerpc as powerpc32
@@ -19,15 +19,19 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Rebase to 1.7.1
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+
+[2026-11-17] Rebase to 1.8.0.
+rebase CFLAGS patch to 1.8.0 (keep -llzma, add powerpc32 alias)
+Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---
- Makefile | 40 +++++++++++++++++++++-------------------
- 1 file changed, 21 insertions(+), 19 deletions(-)
+ Makefile | 39 +++++++++++++++++++++------------------
+ 1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
-index b2ffcec..e416f4e 100644
+index a7b5ec9..a0d86ba 100644
--- a/Makefile
+++ b/Makefile
-@@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
+@@ -8,10 +8,6 @@ ifeq ($(strip $CC),)
CC = gcc
endif
@@ -35,12 +39,10 @@ index b2ffcec..e416f4e 100644
- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"'
-CFLAGS_ARCH := $(CFLAGS_BASE)
--# LDFLAGS = -L/usr/local/lib -I/usr/local/include
--
+ # LDFLAGS = -L/usr/local/lib -I/usr/local/include
+
HOST_ARCH := $(shell uname -m)
- # Use TARGET as the target architecture if specified.
- # Defaults to uname -m
-@@ -24,26 +18,34 @@ endif
+@@ -24,26 +20,33 @@ endif
ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
-e s/arm.*/arm/ -e s/sa110/arm/ \
-e s/s390x/s390/ -e s/parisc64/parisc/ \
@@ -76,12 +78,11 @@ index b2ffcec..e416f4e 100644
+CFLAGS_COMMON = $(CFLAGS_ARCH) \
+ -DVERSION='"$(VERSION)"' \
+ -DRELEASE_DATE='"$(DATE)"'
-+
+
SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
- SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c detect_cycle.c
+ SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c printk.c detect_cycle.c kallsyms.c btf_info.c extension.c
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
-@@ -52,12 +54,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
+@@ -52,12 +55,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
LIBS = -ldw -lbz2 -ldl -lelf -lz
ifneq ($(LINKTYPE), dynamic)
@@ -96,7 +97,7 @@ index b2ffcec..e416f4e 100644
endif
ifeq ($(USESNAPPY), on)
-@@ -65,12 +67,12 @@ LIBS := -lsnappy $(LIBS)
+@@ -65,17 +68,17 @@ LIBS := -lsnappy $(LIBS)
ifneq ($(LINKTYPE), dynamic)
LIBS := $(LIBS) -lstdc++
endif
@@ -110,8 +111,14 @@ index b2ffcec..e416f4e 100644
+CFLAGS_COMMON += -DUSEZSTD
endif
+ ifeq ($(EXTENSION), on)
+ LIBS := -lbpf $(LIBS)
+-CFLAGS += -DEXTENSION
++CFLAGS_COMMON += -DEXTENSION
+ endif
+
ifeq ($(DEBUG), on)
-@@ -106,14 +108,14 @@ SBINDIR ?= /usr/sbin
+@@ -111,14 +114,14 @@ SBINDIR ?= /usr/sbin
all: makedumpfile
$(OBJ_PART): $(SRC_PART)
@@ -123,12 +130,12 @@ index b2ffcec..e416f4e 100644
$(CC) $(CFLAGS_ARCH) -c -o ./$@ $(VPATH)$(@:.o=.c)
makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
-- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
-+ $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
+- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -Wl,-T,makedumpfile.ld -o $@ $< $(LIBS)
++ $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -Wl,-T,makedumpfile.ld -o $@ $< $(LIBS)
@sed -e "s/@DATE@/$(DATE)/" \
-e "s/@VERSION@/$(VERSION)/" \
$(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8
-@@ -122,7 +124,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
+@@ -127,7 +130,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
$(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5
eppic_makedumpfile.so: extension_eppic.c
similarity index 96%
rename from meta/recipes-kernel/makedumpfile/makedumpfile_1.7.9.bb
rename to meta/recipes-kernel/makedumpfile/makedumpfile_1.8.0.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
LICENSE = "GPL-2.0-only"
SRCBRANCH ?= "master"
-SRCREV = "eb42d6330b275ba344ca170286480917450d7f73"
+SRCREV = "ae6c64cd2693cd7c4b683d1948d4bb1b206636d0"
DEPENDS = "bzip2 zlib elfutils xz"
RDEPENDS:${PN}-tools = "perl ${PN}"
ReleaseInfo: https://github.com/makedumpfile/makedumpfile/releases/tag/1.8.0 [v1.8.0] Update version [PATCH] Derive the mem_section mem_map mask from SIZE(page) [PATCH] README: Remove email addresses that will be gone and update information [PATCH v2 7/9] Add PG_INCLUDE_HEAD extension return status [PATCH v2 6/9] Simplify arguments for page checks [PATCH v2 5/9] Move page checks into makedumpfile.h [PATCH v2 4/9] Introduce a stat for pages retained by extension [PATCH v2 3/9] Share page information with extension callbacks [PATCH v2 2/9] Honor CFLAGS in extensions/Makefile [PATCH v2 1/9] Do not call extensions for tail pages [PATCH 6/6] Ensure e_phentsize does not exceed buf size [PATCH 5/6] Ensure get_smram_cpu_state() does not read beyond smram [PATCH 4/6] Add an out-of-bounds check for info->valid_pages[] [PATCH 3/6] Prevent a multiply overflow in cache_init() [PATCH 2/6] Add an out-of-bounds check for si->block_table[] [PATCH 1/6] Ensure page_desc does not exceed page_size [PATCH] Avoid glibc lazy-unwind machinery in parallel teardown [PATCH] arm64: Add 5-level page table support for 4K pages with 52-bit VA [PATCH v6 09/10] Doc: Add --extension option to makedumpfile manual [PATCH v6 08/10] Add erase_sample extension as an data erase reference [PATCH v6 07/10] Add sample extension as an example reference [PATCH v6 06/10] Add makedumpfile extensions support [PATCH v6 05/10] Implement kernel module's btf resolving [PATCH v6 04/10] Implement kernel module's kallsyms resolving [PATCH v6 03/10] Implement kernel btf resolving [PATCH v6 02/10] Implement kernel kallsyms resolving [PATCH v6 01/10] Reserve sections for makedumpfile and extenions [PATCH] Fix error and simplify eppic_scripts/proc_names_3_10_to_4_8.c [PATCH] Fix wrong exclusion of compound tail pages on Linux 7.1 and later [PATCH v2 2/2] riscv64: Fix huge page translation in vtop_riscv64() [PATCH v2 1/2] riscv64: Fix vaddr_to_paddr for vmalloc and vmemmap regions [PATCH] Mark start of 1.8.0 development phase with version 1.7.9++ - Refresh existing patch for 1.8.0 Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech> --- ...makedumpfile-replace-hardcode-CFLAGS.patch | 45 +++++++++++-------- ...umpfile_1.7.9.bb => makedumpfile_1.8.0.bb} | 2 +- 2 files changed, 27 insertions(+), 20 deletions(-) rename meta/recipes-kernel/makedumpfile/{makedumpfile_1.7.9.bb => makedumpfile_1.8.0.bb} (96%)