summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-kernel/makedumpfile
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2018-07-31 18:25:40 -0700
committerKhem Raj <raj.khem@gmail.com>2018-08-02 11:23:03 -0700
commit2694423f1c82a59df4e3f462e5cfee63b0d19c1e (patch)
tree52a42d15e26259c8459050b53c0f29252e1ad90f /meta-oe/recipes-kernel/makedumpfile
parent7e4d87bde2e05e92c6bfa856ba48ca05138e73b9 (diff)
downloadmeta-openembedded-2694423f1c82a59df4e3f462e5cfee63b0d19c1e.tar.gz
makedumpfile: Upgrade to 1.6.4
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>
Diffstat (limited to 'meta-oe/recipes-kernel/makedumpfile')
-rw-r--r--meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch16
-rw-r--r--meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch15
-rw-r--r--meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.4.bb (renamed from meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb)4
3 files changed, 16 insertions, 19 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
index d599a9193..a47806526 100644
--- 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
@@ -1,4 +1,4 @@
1From 3c2f4ff583a156a7ed2fa0cc002a413c391d063d Mon Sep 17 00:00:00 2001 1From 8eeb1b15608ce1a9a1f0d5417938fd6da4504406 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 21 Jul 2016 18:06:21 +0800 3Date: Thu, 21 Jul 2016 18:06:21 +0800
4Subject: [PATCH] makedumpfile: replace hardcode CFLAGS 4Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
@@ -13,12 +13,13 @@ Subject: [PATCH] makedumpfile: replace hardcode CFLAGS
13Upstream-Status: Inappropriate[oe specific] 13Upstream-Status: Inappropriate[oe specific]
14 14
15Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 15Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
16
16--- 17---
17 Makefile | 46 +++++++++++++++++++++++----------------------- 18 Makefile | 46 +++++++++++++++++++++++-----------------------
18 1 file changed, 23 insertions(+), 23 deletions(-) 19 1 file changed, 23 insertions(+), 23 deletions(-)
19 20
20diff --git a/Makefile b/Makefile 21diff --git a/Makefile b/Makefile
21index 7dde3e4..c5286ac 100644 22index 612b9d0..f6d6265 100644
22--- a/Makefile 23--- a/Makefile
23+++ b/Makefile 24+++ b/Makefile
24@@ -8,13 +8,6 @@ ifeq ($(strip $CC),) 25@@ -8,13 +8,6 @@ ifeq ($(strip $CC),)
@@ -80,9 +81,9 @@ index 7dde3e4..c5286ac 100644
80+ -DRELEASE_DATE='"$(DATE)"' 81+ -DRELEASE_DATE='"$(DATE)"'
81+ 82+
82 SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h 83 SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h
83 SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c 84 SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c
84 OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) 85 OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
85@@ -54,17 +54,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) 86@@ -53,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
86 87
87 LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz 88 LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
88 ifneq ($(LINKTYPE), dynamic) 89 ifneq ($(LINKTYPE), dynamic)
@@ -103,7 +104,7 @@ index 7dde3e4..c5286ac 100644
103 endif 104 endif
104 105
105 LIBS := -lpthread $(LIBS) 106 LIBS := -lpthread $(LIBS)
106@@ -72,14 +72,14 @@ LIBS := -lpthread $(LIBS) 107@@ -71,14 +71,14 @@ LIBS := -lpthread $(LIBS)
107 all: makedumpfile 108 all: makedumpfile
108 109
109 $(OBJ_PART): $(SRC_PART) 110 $(OBJ_PART): $(SRC_PART)
@@ -120,7 +121,7 @@ index 7dde3e4..c5286ac 100644
120 echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 121 echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
121 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 122 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8
122 mv temp.8 makedumpfile.8 123 mv temp.8 makedumpfile.8
123@@ -90,7 +90,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) 124@@ -89,7 +89,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH)
124 gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz 125 gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz
125 126
126 eppic_makedumpfile.so: extension_eppic.c 127 eppic_makedumpfile.so: extension_eppic.c
@@ -129,6 +130,3 @@ index 7dde3e4..c5286ac 100644
129 130
130 clean: 131 clean:
131 rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz 132 rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz
132--
1332.8.1
134
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
index e0c3d9af6..766f4fc76 100644
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
+++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch
@@ -1,4 +1,4 @@
1From 653fe8e724081d2f289c2245d1220d5f7170538d Mon Sep 17 00:00:00 2001 1From ba123fa6b2aa0ac62d1b78f327339635ae87201a Mon Sep 17 00:00:00 2001
2From: Alexandru Moise <alexandru.moise@windriver.com> 2From: Alexandru Moise <alexandru.moise@windriver.com>
3Date: Fri, 29 Apr 2016 07:40:46 +0000 3Date: Fri, 29 Apr 2016 07:40:46 +0000
4Subject: [PATCH] mem_section: Support only 46 bit for MAX_PHYSMEM_BITS on 4Subject: [PATCH] mem_section: Support only 46 bit for MAX_PHYSMEM_BITS on
@@ -20,18 +20,20 @@ Upstream-Status: Pending
20 20
21Signed-off-by: Alexandru Moise <alexandru.moise@windriver.com> 21Signed-off-by: Alexandru Moise <alexandru.moise@windriver.com>
22Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 22Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
23
23--- 24---
24 arch/ppc64.c | 28 ++-------------------------- 25 arch/ppc64.c | 28 ++--------------------------
25 1 file changed, 2 insertions(+), 26 deletions(-) 26 1 file changed, 2 insertions(+), 26 deletions(-)
26 27
27diff --git a/arch/ppc64.c b/arch/ppc64.c 28diff --git a/arch/ppc64.c b/arch/ppc64.c
28index 89a7f05..6c928ab 100644 29index 8b6f7d5..458f06b 100644
29--- a/arch/ppc64.c 30--- a/arch/ppc64.c
30+++ b/arch/ppc64.c 31+++ b/arch/ppc64.c
31@@ -302,37 +302,13 @@ ppc64_vtop_level4(unsigned long vaddr) 32@@ -462,38 +462,14 @@ ppc64_vtop_level4(unsigned long vaddr)
33 return paddr;
32 } 34 }
33 35
34 int 36-int
35-set_ppc64_max_physmem_bits(void) 37-set_ppc64_max_physmem_bits(void)
36-{ 38-{
37- long array_len = ARRAY_LENGTH(mem_section); 39- long array_len = ARRAY_LENGTH(mem_section);
@@ -53,7 +55,7 @@ index 89a7f05..6c928ab 100644
53- return FALSE; 55- return FALSE;
54-} 56-}
55- 57-
56-int 58 int
57 get_machdep_info_ppc64(void) 59 get_machdep_info_ppc64(void)
58 { 60 {
59 unsigned long vmlist, vmap_area_list, vmalloc_start; 61 unsigned long vmlist, vmap_area_list, vmalloc_start;
@@ -68,6 +70,3 @@ index 89a7f05..6c928ab 100644
68 info->page_offset = __PAGE_OFFSET; 70 info->page_offset = __PAGE_OFFSET;
69 71
70 if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) { 72 if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) {
71--
722.5.0
73
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.4.bb
index 38f9d24c9..629e2518f 100644
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb
+++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.4.bb
@@ -25,8 +25,8 @@ SRC_URI = "\
25 file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ 25 file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
26 file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ 26 file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \
27" 27"
28SRC_URI[md5sum] = "72be5bf973eed898c5127e3abc466583" 28SRC_URI[md5sum] = "7dfbca19f487604c271e2892ba07f4bd"
29SRC_URI[sha256sum] = "ee3d21cb4032a60bd2c802d1d8b21b9f399710e1574f8de8ead5ab50cd821a6d" 29SRC_URI[sha256sum] = "7e06f72d5f291fcab9e92975f405a76e37d4f7fc8fa4172f199636398ae812b1"
30 30
31UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/" 31UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/"
32UPSTREAM_CHECK_REGEX = "makedumpfile/(?P<pver>\d+(\.\d+)+)/" 32UPSTREAM_CHECK_REGEX = "makedumpfile/(?P<pver>\d+(\.\d+)+)/"