]> code.ossystems Code Review - openembedded-core.git/commitdiff
opkg-utils: remove python scripts etc for the class-target only
authorAndre McCurdy <armccurdy@gmail.com>
Mon, 16 Mar 2020 18:48:56 +0000 (11:48 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 28 Mar 2020 10:24:40 +0000 (10:24 +0000)
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.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb

index eda73db6a4b675b76ad86accebd36d93c6812858..9315240190f20d6ca643dcb519278d34162aae6e 100644 (file)
@@ -34,13 +34,13 @@ do_install() {
        if ! ${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'true', 'false', d)}; then
                rm -f "${D}${bindir}/update-alternatives"
        fi
-
-    if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then
-        grep -lZ "/usr/bin/env.*python" ${D}${bindir}/* | xargs -0 rm
-    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