Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Andre McCurdy <armccurdy@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/5] opkg-utils: remove python scripts etc for the class-target only
Date: Mon, 16 Mar 2020 11:48:56 -0700	[thread overview]
Message-ID: <20200316184859.11635-2-armccurdy@gmail.com> (raw)
In-Reply-To: <20200316184859.11635-1-armccurdy@gmail.com>

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>
---
 meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb | 8 ++++----
 1 file 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
-- 
2.24.0



  reply	other threads:[~2020-03-16 18:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-16 18:48 [PATCH 1/5] gcc-runtime: apply ARM specific workaround to big-endian ARM too Andre McCurdy
2020-03-16 18:48 ` Andre McCurdy [this message]
2020-03-26 15:31   ` [OE-core] [PATCH 2/5] opkg-utils: remove python scripts etc for the class-target only Khem Raj
2020-03-16 18:48 ` [PATCH 3/5] tune-arm1136jf-s.inc: restore vfp to TUNE_FEATURES_tune-arm1136jfs Andre McCurdy
2020-03-16 18:48 ` [PATCH 4/5] tune-arm1176jz-s.inc: fix typo in PACKAGE_EXTRA_ARCHS_tune-arm1176jzs Andre McCurdy
2020-03-16 18:48 ` [PATCH 5/5] qemuarmv5.conf: drop stray comment including tune-arm1136jf-s.inc Andre McCurdy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200316184859.11635-2-armccurdy@gmail.com \
    --to=armccurdy@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox