summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-kernel
diff options
context:
space:
mode:
authorEtienne Cordonnier <ecordonnier@snap.com>2024-10-15 14:25:49 +0200
committerKhem Raj <raj.khem@gmail.com>2024-10-15 08:15:36 -0700
commit656b81ef80621911f534ed64c2ad4487d55d127e (patch)
tree8a070ef8610d8269c7728ec24fdb260b35b74fe8 /meta-oe/recipes-kernel
parent6a5b26d467c692c3537aaebf9bd088736dc93dc4 (diff)
downloadmeta-openembedded-656b81ef80621911f534ed64c2ad4487d55d127e.tar.gz
makedumpfile: Remove recipe
makedumpfile has been moved from meta-openembedded to poky ( https://git.yoctoproject.org/poky/commit/?id=acd8c9528f825e05eac570ba69b360b222dea45d ), because it was needed as RDEPENDS dependency of kexec-tools. Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-kernel')
-rw-r--r--meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch139
-rw-r--r--meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb62
2 files changed, 0 insertions, 201 deletions
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
deleted file mode 100644
index 96a996f616..0000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
+++ /dev/null
@@ -1,139 +0,0 @@
1From 6d16911316cb576db0239f607e60918a222e4436 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Sun, 24 Apr 2022 17:25:33 +0800
4Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
5
6* Create alias for target such as powerpc as powerpc32
7* Remove hardcode CFLAGS
8* Add CFLAGS_COMMON to instead of CFLAGS so can flexibly
9 customize CFLAGS and not hardcode the CFLAGS as previously
10* Forcibly to link dynamic library as the poky build
11 system doesn't build static library by default
12
13Upstream-Status: Inappropriate [oe specific]
14
15Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
16
17[2021-11-18] Patch updated to use CFLAGS_COMMON for zstd
18Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
19
20Rebase to 1.7.1
21Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
22---
23 Makefile | 40 +++++++++++++++++++++-------------------
24 1 file changed, 21 insertions(+), 19 deletions(-)
25
26diff --git a/Makefile b/Makefile
27index 71d8548..22acdd5 100644
28--- a/Makefile
29+++ b/Makefile
30@@ -8,12 +8,6 @@ ifeq ($(strip $CC),)
31 CC = gcc
32 endif
33
34-CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
35- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
36-CFLAGS := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"'
37-CFLAGS_ARCH := $(CFLAGS_BASE)
38-# LDFLAGS = -L/usr/local/lib -I/usr/local/include
39-
40 HOST_ARCH := $(shell uname -m)
41 # Use TARGET as the target architecture if specified.
42 # Defaults to uname -m
43@@ -24,26 +18,34 @@ endif
44 ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \
45 -e s/arm.*/arm/ -e s/sa110/arm/ \
46 -e s/s390x/s390/ -e s/parisc64/parisc/ \
47- -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/)
48+ -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \
49+ -e s/_powerpc_/_powerpc32_/)
50
51 CROSS :=
52 ifneq ($(TARGET), $(HOST_ARCH))
53 CROSS := -U__$(HOST_ARCH)__
54 endif
55
56-CFLAGS += -D__$(ARCH)__ $(CROSS)
57 CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS)
58
59-ifeq ($(ARCH), powerpc64)
60-CFLAGS += -m64
61+ifeq ($(ARCH), __powerpc64__)
62 CFLAGS_ARCH += -m64
63 endif
64
65-ifeq ($(ARCH), powerpc32)
66-CFLAGS += -m32
67+ifeq ($(ARCH), __powerpc32__)
68 CFLAGS_ARCH += -m32
69 endif
70
71+CFLAGS_ARCH += $(CFLAGS) \
72+ -D_FILE_OFFSET_BITS=64 \
73+ -D_LARGEFILE_SOURCE \
74+ -D_LARGEFILE64_SOURCE
75+
76+CFLAGS_COMMON = $(CFLAGS_ARCH) \
77+ -DVERSION='"$(VERSION)"' \
78+ -DRELEASE_DATE='"$(DATE)"'
79+
80+
81 SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
82 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
83 OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
84@@ -52,12 +54,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
85
86 LIBS = -ldw -lbz2 -ldl -lelf -lz
87 ifneq ($(LINKTYPE), dynamic)
88-LIBS := -static $(LIBS) -llzma
89+LIBS := $(LIBS) -llzma
90 endif
91
92 ifeq ($(USELZO), on)
93 LIBS := -llzo2 $(LIBS)
94-CFLAGS += -DUSELZO
95+CFLAGS_COMMON += -DUSELZO
96 endif
97
98 ifeq ($(USESNAPPY), on)
99@@ -65,12 +67,12 @@ LIBS := -lsnappy $(LIBS)
100 ifneq ($(LINKTYPE), dynamic)
101 LIBS := $(LIBS) -lstdc++
102 endif
103-CFLAGS += -DUSESNAPPY
104+CFLAGS_COMMON += -DUSESNAPPY
105 endif
106
107 ifeq ($(USEZSTD), on)
108 LIBS := -lzstd $(LIBS)
109-CFLAGS += -DUSEZSTD
110+CFLAGS_COMMON += -DUSEZSTD
111 endif
112
113 ifeq ($(DEBUG), on)
114@@ -104,14 +106,14 @@ LIBS := $(LIBS) $(call try-run,\
115 all: makedumpfile
116
117 $(OBJ_PART): $(SRC_PART)
118- $(CC) $(CFLAGS) -c -o ./$@ $(VPATH)$(@:.o=.c)
119+ $(CC) $(CFLAGS_COMMON) -c -o ./$@ $(VPATH)$(@:.o=.c)
120
121 $(OBJ_ARCH): $(SRC_ARCH)
122 @mkdir -p $(@D)
123 $(CC) $(CFLAGS_ARCH) -c -o ./$@ $(VPATH)$(@:.o=.c)
124
125 makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
126- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
127+ $(CC) $(CFLAGS_COMMON) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -rdynamic -o $@ $< $(LIBS)
128 @sed -e "s/@DATE@/$(DATE)/" \
129 -e "s/@VERSION@/$(VERSION)/" \
130 $(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8
131@@ -120,7 +122,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
132 $(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5
133
134 eppic_makedumpfile.so: extension_eppic.c
135- $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
136+ $(CC) $(CFLAGS_COMMON) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
137
138 clean:
139 rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb
deleted file mode 100644
index 85b44c4941..0000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.7.5.bb
+++ /dev/null
@@ -1,62 +0,0 @@
1SUMMARY = "VMcore extraction tool"
2DESCRIPTION = "\
3 This program is used to extract a subset of the memory available either \
4 via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \
5 images without extra uneeded information (zero pages, userspace programs, \
6 etc). \
7"
8HOMEPAGE = "https://github.com/makedumpfile/makedumpfile"
9
10LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
11LICENSE = "GPL-2.0-only"
12
13SRCBRANCH ?= "master"
14SRCREV = "c266469347d49287be38059d45e7aaa454db9cb2"
15
16DEPENDS = "bzip2 zlib elfutils xz"
17RDEPENDS:${PN}-tools = "perl ${PN}"
18
19# mips/rv32 would not compile.
20COMPATIBLE_HOST:mipsarcho32 = "null"
21COMPATIBLE_HOST:riscv32 = "null"
22
23PACKAGES =+ "${PN}-tools"
24FILES:${PN}-tools = "${bindir}/*.pl"
25
26SRC_URI = "\
27 git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH};protocol=https \
28 file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
29"
30
31S = "${WORKDIR}/git"
32
33UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
34
35SECTION = "base"
36
37# If we do not specify TARGET, makedumpfile will build for the host but use the
38# target gcc.
39#
40
41MAKEDUMPFILE_TARGET ?= "${TARGET_ARCH}"
42MAKEDUMPFILE_TARGET:powerpc = "ppc"
43
44EXTRA_OEMAKE = "\
45 LINKTYPE=static \
46 TARGET=${MAKEDUMPFILE_TARGET} \
47 ${PACKAGECONFIG_CONFARGS} \
48"
49
50PACKAGECONFIG ??= ""
51PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo"
52PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy"
53PACKAGECONFIG[zstd] = "USEZSTD=on,USEZSTD=off,zstd"
54
55do_install () {
56 mkdir -p ${D}/usr/bin
57 install -m 755 ${S}/makedumpfile ${D}/usr/bin
58 install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin
59
60 mkdir -p ${D}/etc/
61 install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample
62}