summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2020-03-16 11:48:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-28 10:24:40 +0000
commitdc243da47e10cc11dce4e2d3b9d59b96e23a0ce2 (patch)
tree156f1dae486d9c1050bcf1349ac0434a8394fc44
parent633010f7c9f369565fd43465a857ad5680405e11 (diff)
downloadopenembedded-core-contrib-dc243da47e10cc11dce4e2d3b9d59b96e23a0ce2.tar.gz
openembedded-core-contrib-dc243da47e10cc11dce4e2d3b9d59b96e23a0ce2.tar.bz2
openembedded-core-contrib-dc243da47e10cc11dce4e2d3b9d59b96e23a0ce2.zip
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. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb8
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() {
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