openipmi: Correct the dep to use python3
PATCH 1/3 openipmi: Correct the dep to use python3
Signed-off-by Khem Raj <[email protected]>
--- meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/openipmi/openipmi_2.0.27.bb +1 -1
@@ -11,7 +11,7 @@ DEPENDS = " \ net-snmp \ openssl \ popt \ - python \ + python3 \ swig-native \ readline \ "
Signature · 1 line
2.25.0
PATCH 2/3 recipes: Turn inherit classes from meta-py2 to conditional constructs
helps parsing without meta-py2 in mix
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb | 2 +- meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb | 2 +- meta-oe/recipes-devtools/guider/guider_3.9.6.bb | 2 +- meta-oe/recipes-devtools/nodejs/nodejs_12.14.0.bb | 2 +- meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb | 2 +- meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb | 2 +- meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb | 3 ++- 7 files changed, 8 insertions(+), 7 deletions(-)
meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz SRC_URI[md5sum] = "92a2de5198284cbd3c430b0d1a971a86" SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab" -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} FILES_${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1"
meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb +1 -1
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit setuptools +inherit ${@bb.utils.contains("BBPATH", "meta-python2", "setuptools", "", d)} python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
meta-oe/recipes-devtools/guider/guider_3.9.6.bb +1 -1
@@ -16,7 +16,7 @@ SRCREV = "fef25c41efb9bde0614ea477d0b90bd9565ae0b4" S = "${WORKDIR}/git" R = "${RECIPE_SYSROOT}" -inherit distutils +inherit ${@bb.utils.contains("BBPATH", "meta-python2", "distutils", "", d)} GUIDER_OBJ = "guider.pyc" GUIDER_SCRIPT = "guider"
meta-oe/recipes-devtools/nodejs/nodejs_12.14.0.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=be4d5107c64dc3d7c57e3797e1a0674b" DEPENDS = "openssl" DEPENDS_append_class-target = " nodejs-native" -inherit pkgconfig pythonnative +inherit pkgconfig ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*"
meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb +1 -1
@@ -30,7 +30,7 @@ SRC_URI[sha256sum] = "9f453c8cc5669e46e38f977764d49a36295bf0d023619d9aac782e6bb3 S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" -inherit autotools pkgconfig perlnative pythonnative +inherit autotools pkgconfig perlnative ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} inherit features_check CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold"
meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://../COPYING;md5=75859989545e37968a99b631ef42722e" SECTION = "System/Management" -inherit setuptools +inherit ${@bb.utils.contains("BBPATH", "meta-python2", "setuptools", "", d)} DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem"
meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +2 -1
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/Datera/lio-utils.git \ SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" S = "${WORKDIR}/git" -inherit distutils +inherit ${@bb.utils.contains("BBPATH", "meta-python2", "distutils", "", d)} EXTRA_OEMAKE += "DESTDIR=${D}"
@@ -70,3 +70,4 @@ python() { raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') } +
Signature · 1 line
2.25.0
PATCH 3/3 recipes: Turn inherit classes from meta-py2 to conditional constructs
In reply to Khem Rajhelps parsing without meta-py2 in mix
Signed-off-by Khem Raj <[email protected]>
--- meta-webserver/recipes-httpd/cherokee/cherokee_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +1 -1
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/cherokee/webserver \ S = "${WORKDIR}/git" -inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd pythonnative +inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"
Signature · 1 line
2.25.0