From 5630f33a1e87d0d9a1d32e8fd5e9b8cf2be54cb4 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 22 Aug 2017 14:01:19 +0800 Subject: 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 Signed-off-by: Martin Jansa --- ...e-Add-proper-format-string-to-print-a-str.patch | 35 -------------- .../makedumpfile/makedumpfile_1.6.1.bb | 55 ---------------------- .../makedumpfile/makedumpfile_1.6.2.bb | 54 +++++++++++++++++++++ 3 files changed, 54 insertions(+), 90 deletions(-) delete mode 100644 meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch delete mode 100644 meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb create mode 100644 meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb (limited to 'meta-oe') 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 @@ -From 0fff28f31aef9ad1d5a817216a3c98ba9d605106 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 19 Jun 2017 23:52:14 -0700 -Subject: [PATCH] makedumpfile: Add proper format string to print a string - -Fix -makedumpfile.c: In function 'write_eraseinfo': -makedumpfile.c:8273:4: error: format not a string literal and no format arguments [-Werror=format-security] - DEBUG_MSG(obuf); - ^~~~~~~~~ -makedumpfile.c:8273:4: error: format not a string literal and no format arguments [-Werror=format-security] - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - makedumpfile.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makedumpfile.c b/makedumpfile.c -index e69b6df..8b8a6b0 100644 ---- a/makedumpfile.c -+++ b/makedumpfile.c -@@ -8270,7 +8270,7 @@ write_eraseinfo(struct cache_data *cd_page, unsigned long *size_out) - } - sprintf(obuf, "erase %s %s", erase_info[i].symbol_expr, - size_str); -- DEBUG_MSG(obuf); -+ DEBUG_MSG("%s", obuf); - if (!write_cache(cd_page, obuf, strlen(obuf))) - goto out; - size_eraseinfo += strlen(obuf); --- -2.13.1 - diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb deleted file mode 100644 index 83bbf7f41..000000000 --- a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.1.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "VMcore extraction tool" -DESCRIPTION = "\ - This program is used to extract a subset of the memory available either \ - via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \ - images without extra uneeded information (zero pages, userspace programs, \ - etc). \ -" -HOMEPAGE = "http://makedumpfile.sourceforge.net" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -LICENSE = "GPLv2.0" - -DEPENDS = "bzip2 zlib elfutils" -RDEPENDS_${PN}-tools = "perl ${PN}" - -# arm would compile but has never been tested upstream. mips would not compile. -# -COMPATIBLE_HOST = "(x86_64|i.86|powerpc|arm).*-linux" - -PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools = "${bindir}/*.pl" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ - file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ - file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ - file://0001-makedumpfile-Add-proper-format-string-to-print-a-str.patch \ -" -SRC_URI[md5sum] = "16c0ae9902ae57be4a603a6ab1e86c53" -SRC_URI[sha256sum] = "0b6e73106998670407887de9e1a505b3a2dbb2fb517a4b968a665eda8fb097ce" - -SECTION = "base" - -# If we do not specify TARGET, makedumpfile will build for the host but use the -# target gcc. -# -EXTRA_OEMAKE = "\ - LINKTYPE=static \ - TARGET=${TARGET_ARCH} \ -" - -do_install () { - mkdir -p ${D}/usr/bin - 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 -} diff --git a/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb new file mode 100644 index 000000000..d6f2d807e --- /dev/null +++ b/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.2.bb @@ -0,0 +1,54 @@ +SUMMARY = "VMcore extraction tool" +DESCRIPTION = "\ + This program is used to extract a subset of the memory available either \ + via /dev/mem or /proc/vmcore (for crashdumps). It is used to get memory \ + images without extra uneeded information (zero pages, userspace programs, \ + etc). \ +" +HOMEPAGE = "http://makedumpfile.sourceforge.net" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +LICENSE = "GPLv2.0" + +DEPENDS = "bzip2 zlib elfutils" +RDEPENDS_${PN}-tools = "perl ${PN}" + +# arm would compile but has never been tested upstream. mips would not compile. +# +COMPATIBLE_HOST = "(x86_64|i.86|powerpc|arm).*-linux" + +PACKAGES =+ "${PN}-tools" +FILES_${PN}-tools = "${bindir}/*.pl" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ + file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ + file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ +" +SRC_URI[md5sum] = "72be5bf973eed898c5127e3abc466583" +SRC_URI[sha256sum] = "ee3d21cb4032a60bd2c802d1d8b21b9f399710e1574f8de8ead5ab50cd821a6d" + +SECTION = "base" + +# If we do not specify TARGET, makedumpfile will build for the host but use the +# target gcc. +# +EXTRA_OEMAKE = "\ + LINKTYPE=static \ + TARGET=${TARGET_ARCH} \ +" + +do_install () { + mkdir -p ${D}/usr/bin + 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 +} -- cgit v1.2.3-54-g00ecf