mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
makedumpfile: upgrade 1.6.6 -> 1.6.7
refresh the following patch: 0001-makedumpfile-replace-hardcode-CFLAGS.patch 0003-build-Delete-libebl-from-required-libraries-during-l.patch removed since it is included in 1.6.7 Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+3
-3
@@ -83,7 +83,7 @@ index 1fdb628..5dce589 100644
|
|||||||
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
|
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
|
||||||
@@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
|
@@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
|
||||||
|
|
||||||
LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
|
LIBS = -ldw -lbz2 -ldl -lelf -lz
|
||||||
ifneq ($(LINKTYPE), dynamic)
|
ifneq ($(LINKTYPE), dynamic)
|
||||||
-LIBS := -static $(LIBS)
|
-LIBS := -static $(LIBS)
|
||||||
+LIBS := $(LIBS)
|
+LIBS := $(LIBS)
|
||||||
@@ -102,7 +102,7 @@ index 1fdb628..5dce589 100644
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
LIBS := -lpthread $(LIBS)
|
LIBS := -lpthread $(LIBS)
|
||||||
@@ -82,14 +83,14 @@ LIBS := $(LIBS) $(call try-run,\
|
@@ -87,14 +88,14 @@ LIBS := $(LIBS) $(call try-run,\
|
||||||
all: makedumpfile
|
all: makedumpfile
|
||||||
|
|
||||||
$(OBJ_PART): $(SRC_PART)
|
$(OBJ_PART): $(SRC_PART)
|
||||||
@@ -119,7 +119,7 @@ index 1fdb628..5dce589 100644
|
|||||||
echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
|
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
|
grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8
|
||||||
mv temp.8 makedumpfile.8
|
mv temp.8 makedumpfile.8
|
||||||
@@ -100,7 +101,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
|
@@ -105,7 +106,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
|
||||||
gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
|
gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
|
||||||
|
|
||||||
eppic_makedumpfile.so: extension_eppic.c
|
eppic_makedumpfile.so: extension_eppic.c
|
||||||
|
|||||||
-34
@@ -1,34 +0,0 @@
|
|||||||
From 460851c15e807d1a2515dfb985423f8a6624f4aa Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Wed, 8 Jan 2020 19:14:19 -0800
|
|
||||||
Subject: [PATCH 3/3] build: Delete libebl from required libraries during link
|
|
||||||
|
|
||||||
This is a static library from elfutils, which is not made available when
|
|
||||||
static archives are disabled, this can result in link failures e.g.
|
|
||||||
|
|
||||||
aarch64-yoe-linux-musl/9.2.0/ld: cannot find -lebl
|
|
||||||
collect2: error: ld returned 1 exit status
|
|
||||||
Makefile:93: recipe for target 'makedumpfile' failed
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 5dce589..c3a4054 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -51,7 +51,7 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
|
|
||||||
SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c arch/sparc64.c
|
|
||||||
OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
|
|
||||||
|
|
||||||
-LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
|
|
||||||
+LIBS = -ldw -lbz2 -ldl -lelf -lz
|
|
||||||
ifneq ($(LINKTYPE), dynamic)
|
|
||||||
LIBS := $(LIBS)
|
|
||||||
endif
|
|
||||||
--
|
|
||||||
2.24.1
|
|
||||||
|
|
||||||
+2
-3
@@ -24,10 +24,9 @@ SRC_URI = "\
|
|||||||
${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \
|
${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \
|
||||||
file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
|
file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
|
||||||
file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \
|
file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \
|
||||||
file://0003-build-Delete-libebl-from-required-libraries-during-l.patch \
|
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "6fd632b97ad78d9a0a3b0f0989094064"
|
SRC_URI[md5sum] = "808ef840ca49ca6bfde77c097cf429f5"
|
||||||
SRC_URI[sha256sum] = "d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324"
|
SRC_URI[sha256sum] = "e702fbdf62b4cd829a76e46f3e24eb3fc7501918b85ebdcd8baef4f53d6ee2c8"
|
||||||
|
|
||||||
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/"
|
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/"
|
||||||
UPSTREAM_CHECK_REGEX = "makedumpfile/(?P<pver>\d+(\.\d+)+)/"
|
UPSTREAM_CHECK_REGEX = "makedumpfile/(?P<pver>\d+(\.\d+)+)/"
|
||||||
Reference in New Issue
Block a user