diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-11-07 13:31:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-11-07 13:31:53 +0000 |
| commit | 8c22ff0d8b70d9b12f0487ef696a7e915b9e3173 (patch) | |
| tree | efdc32587159d0050a69009bdf2330a531727d95 /meta/recipes-devtools/opkg-utils | |
| parent | d412d2747595c1cc4a5e3ca975e3adc31b2f7891 (diff) | |
| download | poky-8c22ff0d8b70d9b12f0487ef696a7e915b9e3173.tar.gz | |
The poky repository master branch is no longer being updated.
You can either:
a) switch to individual clones of bitbake, openembedded-core, meta-yocto and yocto-docs
b) use the new bitbake-setup
You can find information about either approach in our documentation:
https://docs.yoctoproject.org/
Note that "poky" the distro setting is still available in meta-yocto as
before and we continue to use and maintain that.
Long live Poky!
Some further information on the background of this change can be found
in: https://lists.openembedded.org/g/openembedded-architecture/message/2179
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg-utils')
| -rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-correctly-match-priority.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb | 63 |
2 files changed, 0 insertions, 91 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-correctly-match-priority.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-correctly-match-priority.patch deleted file mode 100644 index 556d4ce5f5..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-update-alternatives-correctly-match-priority.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From 26206005dacd61380663bb4fd9b18178bb33665b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Sat, 24 Oct 2020 21:59:27 +0200 | ||
| 4 | Subject: [PATCH] update-alternatives: correctly match priority | ||
| 5 | |||
| 6 | It should always be at the end of string, otherwise something | ||
| 7 | like "/usr/bin/python3.9-config 123" will erroneously match | ||
| 8 | against priority 9. | ||
| 9 | |||
| 10 | Upstream-Status: Submitted | ||
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 12 | --- | ||
| 13 | update-alternatives | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/update-alternatives b/update-alternatives | ||
| 17 | index 1389b3f..e0b31bf 100644 | ||
| 18 | --- a/update-alternatives | ||
| 19 | +++ b/update-alternatives | ||
| 20 | @@ -94,7 +94,7 @@ add_alt() { | ||
| 21 | local path="$2" | ||
| 22 | local priority="$3" | ||
| 23 | remove_alt $name $path | ||
| 24 | - if grep -qw "$priority" $ad/$name; then | ||
| 25 | + if grep -qw "$priority"$ $ad/$name; then | ||
| 26 | echo "Warn: update-alternatives: $name has multiple providers with the same priority, please check $ad/$name for details" | ||
| 27 | fi | ||
| 28 | echo "$path $priority" >> $ad/$name | ||
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb deleted file mode 100644 index 9f1a91e1d3..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb +++ /dev/null | |||
| @@ -1,63 +0,0 @@ | |||
| 1 | SUMMARY = "Additional utilities for the opkg package manager" | ||
| 2 | SUMMARY:update-alternatives-opkg = "Utility for managing the alternatives system" | ||
| 3 | SECTION = "base" | ||
| 4 | HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils" | ||
| 5 | LICENSE = "GPL-2.0-or-later" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
| 7 | file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" | ||
| 8 | PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" | ||
| 9 | |||
| 10 | SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \ | ||
| 11 | file://0001-update-alternatives-correctly-match-priority.patch \ | ||
| 12 | " | ||
| 13 | SRCREV = "68a969f0e867ace0d94faf8ebe7c7bb67f59d386" | ||
| 14 | |||
| 15 | TARGET_CC_ARCH += "${LDFLAGS}" | ||
| 16 | |||
| 17 | RDEPENDS:${PN} += "bash" | ||
| 18 | |||
| 19 | inherit perlnative | ||
| 20 | |||
| 21 | # For native builds we use the host Python | ||
| 22 | PYTHONRDEPS = "python3 python3-shell python3-io python3-math python3-crypt python3-logging python3-fcntl python3-pickle python3-compression python3-stringold" | ||
| 23 | PYTHONRDEPS:class-native = "" | ||
| 24 | |||
| 25 | PACKAGECONFIG = "python update-alternatives" | ||
| 26 | PACKAGECONFIG[python] = ",,,${PYTHONRDEPS}" | ||
| 27 | PACKAGECONFIG[update-alternatives] = ",,," | ||
| 28 | |||
| 29 | do_install() { | ||
| 30 | oe_runmake PREFIX=${prefix} DESTDIR=${D} install | ||
| 31 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'true', 'false', d)}; then | ||
| 32 | rm -f "${D}${bindir}/update-alternatives" | ||
| 33 | fi | ||
| 34 | } | ||
| 35 | |||
| 36 | do_install:append:class-target() { | ||
| 37 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then | ||
| 38 | grep -lZ "/usr/bin/env.*python" ${D}${bindir}/* | xargs -0 rm | ||
| 39 | fi | ||
| 40 | |||
| 41 | if [ -e "${D}${bindir}/update-alternatives" ]; then | ||
| 42 | sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g' | ||
| 43 | fi | ||
| 44 | } | ||
| 45 | |||
| 46 | # These are empty and will pull python3-dev into images where it wouldn't | ||
| 47 | # have been otherwise, so don't generate them. | ||
| 48 | PACKAGES:remove = "${PN}-dev ${PN}-staticdev" | ||
| 49 | |||
| 50 | PACKAGES =+ "update-alternatives-opkg" | ||
| 51 | FILES:update-alternatives-opkg = "${bindir}/update-alternatives" | ||
| 52 | RPROVIDES:update-alternatives-opkg = "update-alternatives update-alternatives-cworth" | ||
| 53 | RREPLACES:update-alternatives-opkg = "update-alternatives-cworth" | ||
| 54 | RCONFLICTS:update-alternatives-opkg = "update-alternatives-cworth" | ||
| 55 | |||
| 56 | pkg_postrm:update-alternatives-opkg() { | ||
| 57 | rm -rf $D${nonarch_libdir}/opkg/alternatives | ||
| 58 | rmdir $D${nonarch_libdir}/opkg || true | ||
| 59 | } | ||
| 60 | |||
| 61 | BBCLASSEXTEND = "native nativesdk" | ||
| 62 | |||
| 63 | CLEANBROKEN = "1" | ||
