summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-kernel/makedumpfile
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2017-08-22 14:01:19 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-28 11:06:03 +0200
commit5630f33a1e87d0d9a1d32e8fd5e9b8cf2be54cb4 (patch)
tree208bb0b5f96936a7dbfc0b6aa076c1aa5a018e83 /meta-oe/recipes-kernel/makedumpfile
parent5272165c3f1f0db5aeb483028c68bf86043653f3 (diff)
downloadmeta-openembedded-5630f33a1e87d0d9a1d32e8fd5e9b8cf2be54cb4.tar.gz
makedumpfile: update to 1.6.2
Remove add-proper-format-string-to-print-a-str.patch since it had been merged in upstream. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-kernel/makedumpfile')
-rw-r--r--meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch35
-rw-r--r--meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb (renamed from meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb)5
2 files changed, 2 insertions, 38 deletions
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch b/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch
deleted file mode 100644
index 056a0bade..000000000
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 0fff28f31aef9ad1d5a817216a3c98ba9d605106 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 19 Jun 2017 23:52:14 -0700
4Subject: [PATCH] makedumpfile: Add proper format string to print a string
5
6Fix
7makedumpfile.c: In function 'write_eraseinfo':
8makedumpfile.c:8273:4: error: format not a string literal and no format arguments [-Werror=format-security]
9 DEBUG_MSG(obuf);
10 ^~~~~~~~~
11makedumpfile.c:8273:4: error: format not a string literal and no format arguments [-Werror=format-security]
12
13Upstream-Status: Pending
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 makedumpfile.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/makedumpfile.c b/makedumpfile.c
21index e69b6df..8b8a6b0 100644
22--- a/makedumpfile.c
23+++ b/makedumpfile.c
24@@ -8270,7 +8270,7 @@ write_eraseinfo(struct cache_data *cd_page, unsigned long *size_out)
25 }
26 sprintf(obuf, "erase %s %s", erase_info[i].symbol_expr,
27 size_str);
28- DEBUG_MSG(obuf);
29+ DEBUG_MSG("%s", obuf);
30 if (!write_cache(cd_page, obuf, strlen(obuf)))
31 goto out;
32 size_eraseinfo += strlen(obuf);
33--
342.13.1
35
diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb
index 83bbf7f41..d6f2d807e 100644
--- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb
+++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb
@@ -24,10 +24,9 @@ SRC_URI = "\
24 ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ 24 ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \
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 file://0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch \
28" 27"
29SRC_URI[md5sum] = "16c0ae9902ae57be4a603a6ab1e86c53" 28SRC_URI[md5sum] = "72be5bf973eed898c5127e3abc466583"
30SRC_URI[sha256sum] = "0b6e73106998670407887de9e1a505b3a2dbb2fb517a4b968a665eda8fb097ce" 29SRC_URI[sha256sum] = "ee3d21cb4032a60bd2c802d1d8b21b9f399710e1574f8de8ead5ab50cd821a6d"
31 30
32SECTION = "base" 31SECTION = "base"
33 32