mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-13 05:30:02 +00:00
Code Issues Projects Releases Wiki Activity

makedumpfile: Upgrade to 1.6.4

Browse Source 
Refresh the patches to avoid fuzz warnings

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
2018-07-31 18:25:40 -07:00
committed by Khem Raj
parent 7e4d87bde2
commit 2694423f1c
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch
+7 -9
View File
@@ -1,4 +1,4 @@
From 3c2f4ff583a156a7ed2fa0cc002a413c391d063d Mon Sep 17 00:00:00 2001 From 8eeb1b15608ce1a9a1f0d5417938fd6da4504406 Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com> From: Mingli Yu <mingli.yu@windriver.com>
Date: Thu, 21 Jul 2016 18:06:21 +0800 Date: Thu, 21 Jul 2016 18:06:21 +0800
Subject: [PATCH] makedumpfile: replace hardcode CFLAGS Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
@@ -13,12 +13,13 @@ Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
Upstream-Status: Inappropriate[oe specific] Upstream-Status: Inappropriate[oe specific]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
--- ---
Makefile | 46 +++++++++++++++++++++++----------------------- Makefile | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-) 1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 7dde3e4..c5286ac 100644 index 612b9d0..f6d6265 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -8,13 +8,6 @@ ifeq ($(strip $CC),) @@ -8,13 +8,6 @@ ifeq ($(strip $CC),)
@@ -80,9 +81,9 @@ index 7dde3e4..c5286ac 100644
+ -DRELEASE_DATE='"$(DATE)"' + -DRELEASE_DATE='"$(DATE)"'
+ +
SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h 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 SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
@@ -54,17 +54,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) @@ -53,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
ifneq ($(LINKTYPE), dynamic) ifneq ($(LINKTYPE), dynamic)
@@ -103,7 +104,7 @@ index 7dde3e4..c5286ac 100644
endif endif
LIBS := -lpthread $(LIBS) LIBS := -lpthread $(LIBS)
@@ -72,14 +72,14 @@ LIBS := -lpthread $(LIBS) @@ -71,14 +71,14 @@ LIBS := -lpthread $(LIBS)
all: makedumpfile all: makedumpfile
$(OBJ_PART): $(SRC_PART) $(OBJ_PART): $(SRC_PART)
@@ -120,7 +121,7 @@ index 7dde3e4..c5286ac 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
@@ -90,7 +90,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) @@ -89,7 +89,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
@@ -129,6 +130,3 @@ index 7dde3e4..c5286ac 100644
clean: 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.gz makedumpfile.conf.5.gz
--
2.8.1
meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
+7 -8
View File
@@ -1,4 +1,4 @@
From 653fe8e724081d2f289c2245d1220d5f7170538d Mon Sep 17 00:00:00 2001 From ba123fa6b2aa0ac62d1b78f327339635ae87201a Mon Sep 17 00:00:00 2001
From: Alexandru Moise <alexandru.moise@windriver.com> From: Alexandru Moise <alexandru.moise@windriver.com>
Date: Fri, 29 Apr 2016 07:40:46 +0000 Date: Fri, 29 Apr 2016 07:40:46 +0000
Subject: [PATCH] mem_section: Support only 46 bit for MAX_PHYSMEM_BITS on Subject: [PATCH] mem_section: Support only 46 bit for MAX_PHYSMEM_BITS on
@@ -20,18 +20,20 @@ Upstream-Status: Pending
Signed-off-by: Alexandru Moise <alexandru.moise@windriver.com> Signed-off-by: Alexandru Moise <alexandru.moise@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
--- ---
arch/ppc64.c | 28 ++-------------------------- arch/ppc64.c | 28 ++--------------------------
1 file changed, 2 insertions(+), 26 deletions(-) 1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/arch/ppc64.c b/arch/ppc64.c diff --git a/arch/ppc64.c b/arch/ppc64.c
index 89a7f05..6c928ab 100644 index 8b6f7d5..458f06b 100644
--- a/arch/ppc64.c --- a/arch/ppc64.c
+++ b/arch/ppc64.c +++ b/arch/ppc64.c
@@ -302,37 +302,13 @@ ppc64_vtop_level4(unsigned long vaddr) @@ -462,38 +462,14 @@ ppc64_vtop_level4(unsigned long vaddr)
return paddr;
} }
int -int
-set_ppc64_max_physmem_bits(void) -set_ppc64_max_physmem_bits(void)
-{ -{
- long array_len = ARRAY_LENGTH(mem_section); - long array_len = ARRAY_LENGTH(mem_section);
@@ -53,7 +55,7 @@ index 89a7f05..6c928ab 100644
- return FALSE; - return FALSE;
-} -}
- -
-int int
get_machdep_info_ppc64(void) get_machdep_info_ppc64(void)
{ {
unsigned long vmlist, vmap_area_list, vmalloc_start; unsigned long vmlist, vmap_area_list, vmalloc_start;
@@ -68,6 +70,3 @@ index 89a7f05..6c928ab 100644
info->page_offset = __PAGE_OFFSET; info->page_offset = __PAGE_OFFSET;
if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) { if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) {
--
2.5.0
meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb → meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.4.bb
+2 -2
View File
@@ -25,8 +25,8 @@ SRC_URI = "\
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 \
" "
SRC_URI[md5sum] = "72be5bf973eed898c5127e3abc466583" SRC_URI[md5sum] = "7dfbca19f487604c271e2892ba07f4bd"
SRC_URI[sha256sum] = "ee3d21cb4032a60bd2c802d1d8b21b9f399710e1574f8de8ead5ab50cd821a6d" SRC_URI[sha256sum] = "7e06f72d5f291fcab9e92975f405a76e37d4f7fc8fa4172f199636398ae812b1"
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+)+)/"