From cb9bfb2af9af3fffb7f5ae8ec3444e5943b145fc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 2 Nov 2020 17:48:04 +0100 Subject: debianutils: upgrade 4.11.1 -> 4.11.2 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../debianutils/debianutils_4.11.1.bb | 54 --------------------- .../debianutils/debianutils_4.11.2.bb | 55 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-support/debianutils/debianutils_4.11.1.bb create mode 100644 meta/recipes-support/debianutils/debianutils_4.11.2.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/debianutils/debianutils_4.11.1.bb b/meta/recipes-support/debianutils/debianutils_4.11.1.bb deleted file mode 100644 index 3b1767e5ed..0000000000 --- a/meta/recipes-support/debianutils/debianutils_4.11.1.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Miscellaneous utilities specific to Debian" -SECTION = "base" -LICENSE = "GPLv2 & SMAIL_GPL" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=9b912cd0cc654134c0ef3424a0705b94" - -SRC_URI = "http://snapshot.debian.org/archive/debian/20200929T025235Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" -# the package is taken from snapshots.debian.org; that source is static and goes stale -# so we check the latest upstream from a directory that does get updated -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" - -SRC_URI[sha256sum] = "8be869f19c55c18d53d9f0414b68bb966a068b2154e9fbbfc6193827d6af983c" - -inherit autotools update-alternatives - -do_configure_prepend() { - sed -i -e 's:tempfile.1 which.1:which.1: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 tempfile; do - mv ${D}${bindir}/$app ${D}${base_bindir}/$app - done - fi -} - -# 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 tempfile which" - -ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" -ALTERNATIVE_${PN}-run-parts = "run-parts" - -ALTERNATIVE_${PN}-doc = "which.1" -ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" - -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[tempfile] = "${base_bindir}/tempfile" -ALTERNATIVE_LINK_NAME[which] = "${bindir}/which" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/debianutils/debianutils_4.11.2.bb b/meta/recipes-support/debianutils/debianutils_4.11.2.bb new file mode 100644 index 0000000000..0eeb2954f7 --- /dev/null +++ b/meta/recipes-support/debianutils/debianutils_4.11.2.bb @@ -0,0 +1,55 @@ +SUMMARY = "Miscellaneous utilities specific to Debian" +SECTION = "base" +LICENSE = "GPLv2 & SMAIL_GPL" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=9b912cd0cc654134c0ef3424a0705b94" + +SRC_URI = "http://snapshot.debian.org/archive/debian/20200929T025235Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +# the package is taken from snapshots.debian.org; that source is static and goes stale +# so we check the latest upstream from a directory that does get updated +UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" + +SRC_URI[sha256sum] = "3b680e81709b740387335fac8f8806d71611dcf60874e1a792e862e48a1650de" + +inherit autotools update-alternatives + +S = "${WORKDIR}/debianutils" +do_configure_prepend() { + sed -i -e 's:tempfile.1 which.1:which.1: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 tempfile; do + mv ${D}${bindir}/$app ${D}${base_bindir}/$app + done + fi +} + +# 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 tempfile which" + +ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" +ALTERNATIVE_${PN}-run-parts = "run-parts" + +ALTERNATIVE_${PN}-doc = "which.1" +ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" + +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[tempfile] = "${base_bindir}/tempfile" +ALTERNATIVE_LINK_NAME[which] = "${bindir}/which" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg