From 4a9f9022bd621d4e22238b9af1bf872c9d1f20e2 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 1 Feb 2024 11:20:22 +0800 Subject: cpio: upgrade 2.14 -> 2.15 Changelog: ========== * Fix operation of --no-absolute-filenames --make-directories * Restore access and modification times of symlinks in copy-in and copy-pass modes. 0001-configure-Include-needed-header-for-major-minor-macr.patch revmoed since it's included in 2.15 (From OE-Core rev: c4fb7512a5b1c13234e3733cba1c4bf246c77861) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-extended/cpio/cpio_2.14.bb | 88 ---------------------- meta/recipes-extended/cpio/cpio_2.15.bb | 87 +++++++++++++++++++++ ...nclude-needed-header-for-major-minor-macr.patch | 48 ------------ 3 files changed, 87 insertions(+), 136 deletions(-) delete mode 100644 meta/recipes-extended/cpio/cpio_2.14.bb create mode 100644 meta/recipes-extended/cpio/cpio_2.15.bb delete mode 100644 meta/recipes-extended/cpio/files/0001-configure-Include-needed-header-for-major-minor-macr.patch (limited to 'meta/recipes-extended/cpio') diff --git a/meta/recipes-extended/cpio/cpio_2.14.bb b/meta/recipes-extended/cpio/cpio_2.14.bb deleted file mode 100644 index 397bb5d87c..0000000000 --- a/meta/recipes-extended/cpio/cpio_2.14.bb +++ /dev/null @@ -1,88 +0,0 @@ -SUMMARY = "GNU cpio is a program to manage archives of files" -DESCRIPTION = "GNU cpio is a tool for creating and extracting archives, or copying files from one place to \ -another. It handles a number of cpio formats as well as reading and writing tar files." -HOMEPAGE = "http://www.gnu.org/software/cpio/" -SECTION = "base" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ - file://0001-configure-Include-needed-header-for-major-minor-macr.patch \ - file://run-ptest \ - file://test.sh \ - " - -SRC_URI[sha256sum] = "145a340fd9d55f0b84779a44a12d5f79d77c99663967f8cfa168d7905ca52454" - -inherit autotools gettext texinfo ptest - -CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" - -EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" - -do_install () { - autotools_do_install - if [ "${base_bindir}" != "${bindir}" ]; then - install -d ${D}${base_bindir}/ - mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio" - if [ "${sbindir}" != "${bindir}" ]; then - rmdir ${D}${bindir}/ - fi - fi - - # Avoid conflicts with the version from tar - mv "${D}${mandir}/man8/rmt.8" "${D}${mandir}/man8/rmt-cpio.8" -} - -do_compile_ptest() { - oe_runmake -C ${B}/gnu/ check - oe_runmake -C ${B}/lib/ check - oe_runmake -C ${B}/rmt/ check - oe_runmake -C ${B}/src/ check - oe_runmake -C ${B}/tests/ genfile -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests/ - sed -i "/abs_/d" ${B}/tests/atconfig - install --mode=755 ${B}/tests/atconfig ${D}${PTEST_PATH}/tests/ - sed -i "s%${B}/tests:%%g" ${B}/tests/atlocal - sed -i "s%${B}/src:%%g" ${B}/tests/atlocal - install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ - install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ - install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ - install --mode=755 ${WORKDIR}/test.sh ${D}${PTEST_PATH}/test.sh - sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test.sh -} - -# ptest.bbclass currently chowns the ptest directory explicitly, so we need to -# change permission after that has happened so the ptest user can write a -# temporary directory. -do_install_ptest_base:append() { - chgrp -R ptest ${D}${PTEST_PATH}/ - chmod -R g+w ${D}${PTEST_PATH}/ -} - -# The tests need to run as a non-root user, so pull in the ptest user -DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" -PACKAGE_WRITE_DEPS += "ptest-runner" - -RDEPENDS:${PN}-ptest += "ptest-runner" - -PACKAGES =+ "${PN}-rmt" - -FILES:${PN}-rmt = "${sbindir}/rmt*" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE:${PN} = "cpio" -ALTERNATIVE:${PN}-rmt = "rmt" - -ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" - -ALTERNATIVE_PRIORITY[rmt] = "50" -ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/cpio/cpio_2.15.bb b/meta/recipes-extended/cpio/cpio_2.15.bb new file mode 100644 index 0000000000..52070f59a2 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio_2.15.bb @@ -0,0 +1,87 @@ +SUMMARY = "GNU cpio is a program to manage archives of files" +DESCRIPTION = "GNU cpio is a tool for creating and extracting archives, or copying files from one place to \ +another. It handles a number of cpio formats as well as reading and writing tar files." +HOMEPAGE = "http://www.gnu.org/software/cpio/" +SECTION = "base" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ + file://run-ptest \ + file://test.sh \ + " + +SRC_URI[sha256sum] = "efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee4183455499e" + +inherit autotools gettext texinfo ptest + +CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" + +EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" + +do_install () { + autotools_do_install + if [ "${base_bindir}" != "${bindir}" ]; then + install -d ${D}${base_bindir}/ + mv "${D}${bindir}/cpio" "${D}${base_bindir}/cpio" + if [ "${sbindir}" != "${bindir}" ]; then + rmdir ${D}${bindir}/ + fi + fi + + # Avoid conflicts with the version from tar + mv "${D}${mandir}/man8/rmt.8" "${D}${mandir}/man8/rmt-cpio.8" +} + +do_compile_ptest() { + oe_runmake -C ${B}/gnu/ check + oe_runmake -C ${B}/lib/ check + oe_runmake -C ${B}/rmt/ check + oe_runmake -C ${B}/src/ check + oe_runmake -C ${B}/tests/ genfile +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests/ + sed -i "/abs_/d" ${B}/tests/atconfig + install --mode=755 ${B}/tests/atconfig ${D}${PTEST_PATH}/tests/ + sed -i "s%${B}/tests:%%g" ${B}/tests/atlocal + sed -i "s%${B}/src:%%g" ${B}/tests/atlocal + install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ + install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ + install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ + install --mode=755 ${WORKDIR}/test.sh ${D}${PTEST_PATH}/test.sh + sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test.sh +} + +# ptest.bbclass currently chowns the ptest directory explicitly, so we need to +# change permission after that has happened so the ptest user can write a +# temporary directory. +do_install_ptest_base:append() { + chgrp -R ptest ${D}${PTEST_PATH}/ + chmod -R g+w ${D}${PTEST_PATH}/ +} + +# The tests need to run as a non-root user, so pull in the ptest user +DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" +PACKAGE_WRITE_DEPS += "ptest-runner" + +RDEPENDS:${PN}-ptest += "ptest-runner" + +PACKAGES =+ "${PN}-rmt" + +FILES:${PN}-rmt = "${sbindir}/rmt*" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE:${PN} = "cpio" +ALTERNATIVE:${PN}-rmt = "rmt" + +ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" + +ALTERNATIVE_PRIORITY[rmt] = "50" +ALTERNATIVE_LINK_NAME[rmt] = "${sbindir}/rmt" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/cpio/files/0001-configure-Include-needed-header-for-major-minor-macr.patch b/meta/recipes-extended/cpio/files/0001-configure-Include-needed-header-for-major-minor-macr.patch deleted file mode 100644 index 95ece0bbf3..0000000000 --- a/meta/recipes-extended/cpio/files/0001-configure-Include-needed-header-for-major-minor-macr.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8179be21e664cedb2e9d238cc2f6d04965e97275 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff -Date: Thu, 11 May 2023 10:18:44 +0300 -Subject: [PATCH] configure: Include needed header for major/minor macros - -This helps in avoiding the warning about implicit function declaration -which is elevated as error with newer compilers e.g. clang 16 - -Signed-off-by: Khem Raj - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - configure.ac | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index de479e7..c601029 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,8 +43,22 @@ AC_TYPE_UID_T - AC_CHECK_TYPE(gid_t, int) - - AC_HEADER_DIRENT --AX_COMPILE_CHECK_RETTYPE([major], [0]) --AX_COMPILE_CHECK_RETTYPE([minor], [0]) -+AX_COMPILE_CHECK_RETTYPE([major], [0], [ -+#include -+#ifdef MAJOR_IN_MKDEV -+# include -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include -+#endif]) -+AX_COMPILE_CHECK_RETTYPE([minor], [0], [ -+#include -+#ifdef MAJOR_IN_MKDEV -+# include -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include -+#endif]) - - AC_CHECK_FUNCS([fchmod fchown]) - # This is needed for mingw build --- -2.34.1 - -- cgit v1.2.3-54-g00ecf