From 62e87836c419f8f3ff3af0b0e24d2c9cc96fd9e6 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 20 Dec 2023 12:43:26 +0800 Subject: debianutils: upgrade 5.14 -> 5.15 ChangeLog: * Shellscript compatibility with BSD and Mac, for "which -s" * d/tests/smoke: Update to test "which -s" (From OE-Core rev: 06a2f55337d36c2fb18cd360fa70908542114d44) Signed-off-by: Yi Zhao Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../debianutils/debianutils_5.14.bb | 58 ---------------------- .../debianutils/debianutils_5.15.bb | 58 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-support/debianutils/debianutils_5.14.bb create mode 100644 meta/recipes-support/debianutils/debianutils_5.15.bb (limited to 'meta/recipes-support/debianutils') diff --git a/meta/recipes-support/debianutils/debianutils_5.14.bb b/meta/recipes-support/debianutils/debianutils_5.14.bb deleted file mode 100644 index deec8d1fe8..0000000000 --- a/meta/recipes-support/debianutils/debianutils_5.14.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Miscellaneous utilities specific to Debian" -DESCRIPTION = "Provides a number of small utilities which are used \ -primarily by the installation scripts of Debian packages, although \ -you may use them directly. " -HOMEPAGE = "https://packages.debian.org/sid/debianutils" -BUGTRACKER = "https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=debianutils;dist=unstable" -SECTION = "base" -LICENSE = "GPL-2.0-only & SMAIL_GPL" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=4b667f30411d21bc8fd7db85d502a8e9" - -SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \ - " - -SRCREV = "7e63b32ea4126c70a5da958f0106add267810a94" - -inherit autotools update-alternatives - -S = "${WORKDIR}/git" - -# Disable po4a (translated manpages) sub-directory, as that requires po4a to build -do_configure:prepend() { - sed -i -e 's:po4a::g' ${S}/Makefile.am -} - - -do_install:append() { - if [ "${base_bindir}" != "${bindir}" ]; then - # Debian places some utils into ${base_bindir} as does busybox - install -d ${D}${base_bindir} - for app in run-parts; do - mv ${D}${bindir}/$app ${D}${base_bindir}/$app - done - fi - mv ${D}${bindir}/which.debianutils ${D}${bindir}/which -} - -# Note that we package the update-alternatives name. -# -PACKAGES =+ "${PN}-run-parts" -FILES:${PN}-run-parts = "${base_bindir}/run-parts.debianutils" - -RDEPENDS:${PN} += "${PN}-run-parts" -RDEPENDS:${PN}:class-native = "" - -ALTERNATIVE_PRIORITY = "30" -ALTERNATIVE:${PN} = "add-shell installkernel remove-shell savelog which" - -ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" -ALTERNATIVE:${PN}-run-parts = "run-parts" - -ALTERNATIVE_LINK_NAME[add-shell] = "${sbindir}/add-shell" -ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel" -ALTERNATIVE_LINK_NAME[remove-shell] = "${sbindir}/remove-shell" -ALTERNATIVE_LINK_NAME[run-parts] = "${base_bindir}/run-parts" -ALTERNATIVE_LINK_NAME[savelog] = "${bindir}/savelog" -ALTERNATIVE_LINK_NAME[which] = "${bindir}/which" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/debianutils/debianutils_5.15.bb b/meta/recipes-support/debianutils/debianutils_5.15.bb new file mode 100644 index 0000000000..b1368a3b2e --- /dev/null +++ b/meta/recipes-support/debianutils/debianutils_5.15.bb @@ -0,0 +1,58 @@ +SUMMARY = "Miscellaneous utilities specific to Debian" +DESCRIPTION = "Provides a number of small utilities which are used \ +primarily by the installation scripts of Debian packages, although \ +you may use them directly. " +HOMEPAGE = "https://packages.debian.org/sid/debianutils" +BUGTRACKER = "https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=debianutils;dist=unstable" +SECTION = "base" +LICENSE = "GPL-2.0-only & SMAIL_GPL" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=4b667f30411d21bc8fd7db85d502a8e9" + +SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \ + " + +SRCREV = "d886c15810b58e57411048f57d7fb941a6819987" + +inherit autotools update-alternatives + +S = "${WORKDIR}/git" + +# Disable po4a (translated manpages) sub-directory, as that requires po4a to build +do_configure:prepend() { + sed -i -e 's:po4a::g' ${S}/Makefile.am +} + + +do_install:append() { + if [ "${base_bindir}" != "${bindir}" ]; then + # Debian places some utils into ${base_bindir} as does busybox + install -d ${D}${base_bindir} + for app in run-parts; do + mv ${D}${bindir}/$app ${D}${base_bindir}/$app + done + fi + mv ${D}${bindir}/which.debianutils ${D}${bindir}/which +} + +# Note that we package the update-alternatives name. +# +PACKAGES =+ "${PN}-run-parts" +FILES:${PN}-run-parts = "${base_bindir}/run-parts.debianutils" + +RDEPENDS:${PN} += "${PN}-run-parts" +RDEPENDS:${PN}:class-native = "" + +ALTERNATIVE_PRIORITY = "30" +ALTERNATIVE:${PN} = "add-shell installkernel remove-shell savelog which" + +ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" +ALTERNATIVE:${PN}-run-parts = "run-parts" + +ALTERNATIVE_LINK_NAME[add-shell] = "${sbindir}/add-shell" +ALTERNATIVE_LINK_NAME[installkernel] = "${sbindir}/installkernel" +ALTERNATIVE_LINK_NAME[remove-shell] = "${sbindir}/remove-shell" +ALTERNATIVE_LINK_NAME[run-parts] = "${base_bindir}/run-parts" +ALTERNATIVE_LINK_NAME[savelog] = "${bindir}/savelog" +ALTERNATIVE_LINK_NAME[which] = "${bindir}/which" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf