From dc243da47e10cc11dce4e2d3b9d59b96e23a0ce2 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 16 Mar 2020 11:48:56 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools') 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 -- cgit 1.2.3-korg