From c840260ff408dc6229cb89a906bca8f8d265c5d2 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Sat, 18 Feb 2023 18:25:43 +0800 Subject: minicoredumper: upgrade 2.0.2 -> 2.0.3 0001-minicoredumper_demo-Use-optnone-attribute-with-clang.patch removed since it's included in 2.0.3 Changelog: ========== * Dump zero-blocks as 4KB blocks instead of single bytes to speed up piping to the compressor. (Only relevant if tar is not used.) * Drop core data exceeding the ustar 8GB limit. The core file is appropriately truncated and the actions are logged. This fixes tar file corruption for core files >8GB. * Known problems: - If tar is active, core files larger than 8GB will be truncated. If it is known that the core files will be >8GB and the full core file is needed, tar must be disabled. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...per_demo-Use-optnone-attribute-with-clang.patch | 37 ---------------- .../minicoredumper/minicoredumper_2.0.2.bb | 49 ---------------------- .../minicoredumper/minicoredumper_2.0.3.bb | 48 +++++++++++++++++++++ 3 files changed, 48 insertions(+), 86 deletions(-) delete mode 100644 meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper_demo-Use-optnone-attribute-with-clang.patch delete mode 100644 meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.2.bb create mode 100644 meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.3.bb diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper_demo-Use-optnone-attribute-with-clang.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper_demo-Use-optnone-attribute-with-clang.patch deleted file mode 100644 index 05371e5cd6..0000000000 --- a/meta-oe/recipes-kernel/minicoredumper/files/0001-minicoredumper_demo-Use-optnone-attribute-with-clang.patch +++ /dev/null @@ -1,37 +0,0 @@ -From abaac31d1cb4d0ba0e8e9ef7f344e62de3b150de Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 4 Feb 2023 16:50:46 -0800 -Subject: [PATCH] minicoredumper_demo: Use 'optnone' attribute with clang - -clang does not support optimize("On") yet, therefore use optnone which -should give intended results with clang compiler - -Upstream-Status: Submitted [https://github.com/diamon/minicoredumper/pull/7] -Signed-off-by: Khem Raj ---- - src/minicoredumper_demo/main.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/minicoredumper_demo/main.c b/src/minicoredumper_demo/main.c -index 65aac46..e60eb82 100644 ---- a/src/minicoredumper_demo/main.c -+++ b/src/minicoredumper_demo/main.c -@@ -11,8 +11,13 @@ - #include - - #include "minicoredumper.h" -- --int __attribute__((optimize("O0"))) main(int argc, char *argv[]) -+int -+#ifdef __clang__ -+__attribute__((optnone)) -+#else -+__attribute__((optimize("O0"))) -+#endif -+main(int argc, char *argv[]) - { - char *str1 = "This is string 1."; - unsigned long val1 = 0x1abc123f; --- -2.39.1 - diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.2.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.2.bb deleted file mode 100644 index 5763f845a6..0000000000 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.2.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ -to allow minimal and customized crash dumps" -LICENSE = " LGPL-2.1-only & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=71827c617ec7b45a0dd23658347cc1e9 \ - file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ - file://COPYING.LGPLv2.1;md5=321bf41f280cf805086dd5a720b37785 \ - " -DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" - -inherit autotools pkgconfig ptest systemd update-rc.d - -SRCREV = "0bed11b3d69877ce59b1a71359349af60f2009ff" - -SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ - file://0001-minicoredumper_demo-Use-optnone-attribute-with-clang.patch \ - file://minicoredumper.service \ - file://minicoredumper.init \ - file://run-ptest \ - " - -S = "${WORKDIR}/git" - -SYSTEMD_SERVICE:${PN} = "minicoredumper.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME:${PN} = "minicoredumper" -INITSCRIPT_PARAMS:${PN} = "defaults 89" - -EXTRA_OECONF:append = " \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '--with-minicoredumper_demo', '--without-libminicoredumper', d)} \ -" -do_install:append() { - rmdir ${D}${localstatedir}/run - install -d ${D}/${sysconfdir}/minicoredumper - cp -rf ${S}/etc/* ${D}/${sysconfdir}/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/minicoredumper.service ${D}${systemd_system_unitdir} - install -d ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper - - # correct path of minicoredumper - sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${sysconfdir}/init.d/minicoredumper - sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${systemd_system_unitdir}/minicoredumper.service -} - -# http://errors.yoctoproject.org/Errors/Details/186966/ -COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.3.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.3.bb new file mode 100644 index 0000000000..2c4111bc3e --- /dev/null +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.3.bb @@ -0,0 +1,48 @@ +SUMMARY = "minicoredumper provides an alternate core dump facility for Linux \ +to allow minimal and customized crash dumps" +LICENSE = " LGPL-2.1-only & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=71827c617ec7b45a0dd23658347cc1e9 \ + file://COPYING.BSD;md5=b915ac80d5236d6aa659cb986daf00e5 \ + file://COPYING.LGPLv2.1;md5=321bf41f280cf805086dd5a720b37785 \ + " +DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" + +inherit autotools pkgconfig ptest systemd update-rc.d + +SRCREV = "e4706bf28a0699094add5d77a4b97145c2292c47" + +SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ + file://minicoredumper.service \ + file://minicoredumper.init \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +SYSTEMD_SERVICE:${PN} = "minicoredumper.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME:${PN} = "minicoredumper" +INITSCRIPT_PARAMS:${PN} = "defaults 89" + +EXTRA_OECONF:append = " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '--with-minicoredumper_demo', '--without-libminicoredumper', d)} \ +" +do_install:append() { + rmdir ${D}${localstatedir}/run + install -d ${D}/${sysconfdir}/minicoredumper + cp -rf ${S}/etc/* ${D}/${sysconfdir}/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/minicoredumper.service ${D}${systemd_system_unitdir} + install -d ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/minicoredumper.init ${D}${sysconfdir}/init.d/minicoredumper + + # correct path of minicoredumper + sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${sysconfdir}/init.d/minicoredumper + sed -i -e s:/usr/bin/minicoredumper:${sbindir}/minicoredumper:g ${D}${systemd_system_unitdir}/minicoredumper.service +} + +# http://errors.yoctoproject.org/Errors/Details/186966/ +COMPATIBLE_HOST:libc-musl = 'null' -- cgit v1.2.3-54-g00ecf