diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2020-03-16 11:48:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-29 12:05:31 +0100 |
commit | 5bc0593305adaeb20253d8d60fd6a1f97cbdb100 (patch) | |
tree | f845b12d3a0a3aa42a454fd04d9812fdaa865231 /meta | |
parent | 4a3c1b0cf09c61e0d46f3ddc055d61db143748fc (diff) | |
download | poky-5bc0593305adaeb20253d8d60fd6a1f97cbdb100.tar.gz |
opkg-utils: remove python scripts etc for the class-target only
OE's packaging functions assume that the opkg-utils python scipts are
always provided by opkg-utils-native, so the scripts should be removed
for class-target only.
(From OE-Core rev: dc243da47e10cc11dce4e2d3b9d59b96e23a0ce2)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb index eda73db6a4..9315240190 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | |||
@@ -34,13 +34,13 @@ do_install() { | |||
34 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'true', 'false', d)}; then | 34 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'true', 'false', d)}; then |
35 | rm -f "${D}${bindir}/update-alternatives" | 35 | rm -f "${D}${bindir}/update-alternatives" |
36 | fi | 36 | fi |
37 | |||
38 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then | ||
39 | grep -lZ "/usr/bin/env.*python" ${D}${bindir}/* | xargs -0 rm | ||
40 | fi | ||
41 | } | 37 | } |
42 | 38 | ||
43 | do_install_append_class-target() { | 39 | do_install_append_class-target() { |
40 | if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then | ||
41 | grep -lZ "/usr/bin/env.*python" ${D}${bindir}/* | xargs -0 rm | ||
42 | fi | ||
43 | |||
44 | if [ -e "${D}${bindir}/update-alternatives" ]; then | 44 | if [ -e "${D}${bindir}/update-alternatives" ]; then |
45 | sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g' | 45 | sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g' |
46 | fi | 46 | fi |