From 3f3567437d281097efcc979497ba7c35c5be6469 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 17 Jul 2023 17:10:16 +0800 Subject: opkg-utils: upgrade 0.5.0 -> 0.6.2 (From OE-Core rev: b0fe9b3dfbe78716c96b70ef098d9cfbf430d5b7) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../opkg-utils/opkg-utils_0.5.0.bb | 65 ---------------------- .../opkg-utils/opkg-utils_0.6.2.bb | 65 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb deleted file mode 100644 index b27e3ded33..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.5.0.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "Additional utilities for the opkg package manager" -SUMMARY:update-alternatives-opkg = "Utility for managing the alternatives system" -SECTION = "base" -HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils" -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" -PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" - -SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ - file://0001-update-alternatives-correctly-match-priority.patch \ - " -SRCREV = "9239541f14a2529b9d01c0a253ab11afa2822dab" - -S = "${WORKDIR}/git" - -TARGET_CC_ARCH += "${LDFLAGS}" - -RDEPENDS:${PN} += "bash" - -inherit perlnative - -# For native builds we use the host Python -PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold" -PYTHONRDEPS:class-native = "" - -PACKAGECONFIG = "python update-alternatives" -PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}" -PACKAGECONFIG[update-alternatives] = ",,," - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install - if ! ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'true', 'false', d)}; then - rm -f "${D}${bindir}/update-alternatives" - fi -} - -do_install:append:class-target() { - if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - grep -lZ "/usr/bin/env.*python" ${D}${bindir}/* | xargs -0 rm - fi - - if [ -e "${D}${bindir}/update-alternatives" ]; then - sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g' - fi -} - -# These are empty and will pull python3-dev into images where it wouldn't -# have been otherwise, so don't generate them. -PACKAGES:remove = "${PN}-dev ${PN}-staticdev" - -PACKAGES =+ "update-alternatives-opkg" -FILES:update-alternatives-opkg = "${bindir}/update-alternatives" -RPROVIDES:update-alternatives-opkg = "update-alternatives update-alternatives-cworth" -RREPLACES:update-alternatives-opkg = "update-alternatives-cworth" -RCONFLICTS:update-alternatives-opkg = "update-alternatives-cworth" - -pkg_postrm:update-alternatives-opkg() { - rm -rf $D${nonarch_libdir}/opkg/alternatives - rmdir $D${nonarch_libdir}/opkg || true -} - -BBCLASSEXTEND = "native nativesdk" - -CLEANBROKEN = "1" diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb new file mode 100644 index 0000000000..eb88b9b734 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.6.2.bb @@ -0,0 +1,65 @@ +SUMMARY = "Additional utilities for the opkg package manager" +SUMMARY:update-alternatives-opkg = "Utility for managing the alternatives system" +SECTION = "base" +HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" +PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" + +SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ + file://0001-update-alternatives-correctly-match-priority.patch \ + " +SRCREV = "67994e62dc598282830385da75ba9b1abbbda941" + +S = "${WORKDIR}/git" + +TARGET_CC_ARCH += "${LDFLAGS}" + +RDEPENDS:${PN} += "bash" + +inherit perlnative + +# For native builds we use the host Python +PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold" +PYTHONRDEPS:class-native = "" + +PACKAGECONFIG = "python update-alternatives" +PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}" +PACKAGECONFIG[update-alternatives] = ",,," + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install + if ! ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'true', 'false', d)}; then + rm -f "${D}${bindir}/update-alternatives" + fi +} + +do_install:append:class-target() { + if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then + grep -lZ "/usr/bin/env.*python" ${D}${bindir}/* | xargs -0 rm + fi + + if [ -e "${D}${bindir}/update-alternatives" ]; then + sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g' + fi +} + +# These are empty and will pull python3-dev into images where it wouldn't +# have been otherwise, so don't generate them. +PACKAGES:remove = "${PN}-dev ${PN}-staticdev" + +PACKAGES =+ "update-alternatives-opkg" +FILES:update-alternatives-opkg = "${bindir}/update-alternatives" +RPROVIDES:update-alternatives-opkg = "update-alternatives update-alternatives-cworth" +RREPLACES:update-alternatives-opkg = "update-alternatives-cworth" +RCONFLICTS:update-alternatives-opkg = "update-alternatives-cworth" + +pkg_postrm:update-alternatives-opkg() { + rm -rf $D${nonarch_libdir}/opkg/alternatives + rmdir $D${nonarch_libdir}/opkg || true +} + +BBCLASSEXTEND = "native nativesdk" + +CLEANBROKEN = "1" -- cgit v1.2.3-54-g00ecf