Skip to contentSkip to conversation

mstpd: Remove python2 dependency

PATCH New Vignesh Raghavendra 1 participant 1 message Sep 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mstpd: Remove python2 dependency

It looks like ifquery tool under mstpd/utils is the only python script and the script is python3 compatible. See:
https://github.com/mstpd/mstpd/commit/53d35f49502fb453d5b24a8971b86fa19702113e
for more details

Therefore remove python2 dependency by replacing the shebang in do_compile_prepend()

---
 meta-arago-distro/recipes-core/packagegroups/ti-test.bb | 2 +-
 meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb  | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
meta-arago-distro/recipes-core/packagegroups/ti-test.bb +1 -1
index 5dcefea6..b9a5965b 100644
@@ -30,7 +30,7 @@ ARAGO_TEST = "\
     procps \
     mtd-utils-ubifs-tests \
     pcitest \
-    ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "mstpd", "", d)} \
+    mstpd \
     fio \
     git \
 "
meta-arago-extras/recipes-support/mstpctl/mstpd_git.bb +4 -5
index db8f08c4..2bac72f3 100644
@@ -12,14 +12,13 @@ SRCREV = "e4f0ba5a48649a3253f8b353c87c965e12aafc50"
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "python"
-RDEPENDS_${PN} = "python-core"
+DEPENDS = "python3"
+RDEPENDS_${PN} = "python3-core"
 
 inherit autotools
 
 EXTRA_OECONF = "--sbindir=/sbin"
 
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
+do_configure_prepend() {
+	 sed -i -e "s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/utils/ifquery
 }
Signature · 1 line
2.28.0