mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
makedumpfile: Upgrade to 1.7.1
Remove related man pages gz logic as it's removed in new version [1].
[1] 2169de66ec
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Mingli Yu
Khem Raj
parent
dafc1efa15
commit
f2748082e8
|
|
@ -1,6 +1,6 @@
|
|||
From af97e2ad643334b4c7c3d66f971ce9ebb2b596af Mon Sep 17 00:00:00 2001
|
||||
From 71b5a3905d5cd0feca88a0d61d7657ba5296a052 Mon Sep 17 00:00:00 2001
|
||||
From: Mingli Yu <mingli.yu@windriver.com>
|
||||
Date: Thu, 21 Jul 2016 18:06:21 +0800
|
||||
Date: Sun, 24 Apr 2022 17:25:33 +0800
|
||||
Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
|
||||
|
||||
* Create alias for target such as powerpc as powerpc32
|
||||
|
|
@ -16,9 +16,12 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|||
|
||||
[2021-11-18] Patch updated to use CFLAGS_COMMON for zstd
|
||||
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
|
||||
|
||||
Rebase to 1.7.1
|
||||
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
||||
---
|
||||
Makefile | 47 ++++++++++++++++++++++++-----------------------
|
||||
1 file changed, 24 insertions(+), 23 deletions(-)
|
||||
Makefile | 42 ++++++++++++++++++++++--------------------
|
||||
1 file changed, 22 insertions(+), 20 deletions(-)
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
|
|
@ -35,19 +38,13 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
|
|||
HOST_ARCH := $(shell uname -m)
|
||||
# Use TARGET as the target architecture if specified.
|
||||
# Defaults to uname -m
|
||||
@@ -21,29 +15,36 @@ ifeq ($(strip($TARGET)),)
|
||||
TARGET := $(HOST_ARCH)
|
||||
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/ \
|
||||
@@ -24,26 +18,34 @@ 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/ \
|
||||
- -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/)
|
||||
+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/ \
|
||||
+ -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \
|
||||
+ -e s/_powerpc_/_powerpc32_/)
|
||||
+ -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/ \
|
||||
+ -e s/_powerpc_/_powerpc32_/)
|
||||
|
||||
CROSS :=
|
||||
ifneq ($(TARGET), $(HOST_ARCH))
|
||||
|
|
@ -55,8 +52,7 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
|
|||
endif
|
||||
|
||||
-CFLAGS += -D__$(ARCH)__ $(CROSS)
|
||||
-CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS)
|
||||
+CFLAGS_ARCH += -D$(ARCH) $(CROSS)
|
||||
CFLAGS_ARCH += -D__$(ARCH)__ $(CROSS)
|
||||
|
||||
-ifeq ($(ARCH), powerpc64)
|
||||
-CFLAGS += -m64
|
||||
|
|
@ -78,11 +74,12 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
|
|||
+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
|
||||
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
|
||||
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
|
||||
@@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
|
||||
@@ -52,12 +54,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
|
||||
|
||||
LIBS = -ldw -lbz2 -ldl -lelf -lz
|
||||
ifneq ($(LINKTYPE), dynamic)
|
||||
|
|
@ -97,7 +94,7 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
|
|||
endif
|
||||
|
||||
ifeq ($(USESNAPPY), on)
|
||||
@@ -65,12 +66,12 @@ LIBS := -lsnappy $(LIBS)
|
||||
@@ -65,12 +67,12 @@ LIBS := -lsnappy $(LIBS)
|
||||
ifneq ($(LINKTYPE), dynamic)
|
||||
LIBS := $(LIBS) -lstdc++
|
||||
endif
|
||||
|
|
@ -112,7 +109,7 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
|
|||
endif
|
||||
|
||||
ifeq ($(DEBUG), on)
|
||||
@@ -104,14 +105,14 @@ LIBS := $(LIBS) $(call try-run,\
|
||||
@@ -104,14 +106,14 @@ LIBS := $(LIBS) $(call try-run,\
|
||||
all: makedumpfile
|
||||
|
||||
$(OBJ_PART): $(SRC_PART)
|
||||
|
|
@ -126,15 +123,15 @@ Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
|
|||
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)
|
||||
echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
|
||||
grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8
|
||||
mv temp.8 makedumpfile.8
|
||||
@@ -122,7 +123,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(
|
||||
gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
|
||||
@sed -e "s/@DATE@/$(DATE)/" \
|
||||
-e "s/@VERSION@/$(VERSION)/" \
|
||||
$(VPATH)makedumpfile.8.in > $(VPATH)makedumpfile.8
|
||||
@@ -120,7 +122,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(
|
||||
$(VPATH)makedumpfile.conf.5.in > $(VPATH)makedumpfile.conf.5
|
||||
|
||||
eppic_makedumpfile.so: extension_eppic.c
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
|
||||
+ $(CC) $(CFLAGS_COMMON) $(LDFLAGS) -shared -rdynamic -o $@ extension_eppic.c -fPIC -leppic -ltinfo
|
||||
|
||||
clean:
|
||||
rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz
|
||||
rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8 makedumpfile.conf.5
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
|||
LICENSE = "GPL-2.0-only"
|
||||
|
||||
SRCBRANCH ?= "master"
|
||||
SRCREV = "06ef8e2b814feb08a668b7a3783c86674e49a7b1"
|
||||
SRCREV = "74bbdd14ec861552ace1ca63953eb2ef73e1f965"
|
||||
|
||||
DEPENDS = "bzip2 zlib elfutils xz"
|
||||
RDEPENDS:${PN}-tools = "perl ${PN}"
|
||||
|
|
@ -52,12 +52,6 @@ do_install () {
|
|||
install -m 755 ${S}/makedumpfile ${D}/usr/bin
|
||||
install -m 755 ${S}/makedumpfile-R.pl ${D}/usr/bin
|
||||
|
||||
mkdir -p ${D}/usr/share/man/man8
|
||||
install -m 644 ${S}/makedumpfile.8.gz ${D}/usr/share/man/man8
|
||||
|
||||
mkdir -p ${D}/usr/share/man/man5
|
||||
install -m 644 ${S}/makedumpfile.conf.5.gz ${D}/usr/share/man/man5
|
||||
|
||||
mkdir -p ${D}/etc/
|
||||
install -m 644 ${S}/makedumpfile.conf ${D}/etc/makedumpfile.conf.sample
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user