diff options
7 files changed, 8 insertions, 7 deletions
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb index 42ce3301f5..ec45653012 100644 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz | |||
11 | SRC_URI[md5sum] = "92a2de5198284cbd3c430b0d1a971a86" | 11 | SRC_URI[md5sum] = "92a2de5198284cbd3c430b0d1a971a86" |
12 | SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab" | 12 | SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab" |
13 | 13 | ||
14 | inherit autotools pkgconfig pythonnative | 14 | inherit autotools pkgconfig ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} |
15 | 15 | ||
16 | FILES_${PN} += "${datadir}/telepathy \ | 16 | FILES_${PN} += "${datadir}/telepathy \ |
17 | ${datadir}/dbus-1" | 17 | ${datadir}/dbus-1" |
diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb index f1c2b7701c..e125ae4447 100644 --- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb +++ b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb | |||
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e | |||
16 | 16 | ||
17 | S = "${WORKDIR}/${SRCNAME}-${PV}" | 17 | S = "${WORKDIR}/${SRCNAME}-${PV}" |
18 | 18 | ||
19 | inherit setuptools | 19 | inherit ${@bb.utils.contains("BBPATH", "meta-python2", "setuptools", "", d)} |
20 | 20 | ||
21 | python() { | 21 | python() { |
22 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | 22 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): |
diff --git a/meta-oe/recipes-devtools/guider/guider_3.9.6.bb b/meta-oe/recipes-devtools/guider/guider_3.9.6.bb index 397e0cb9a3..1fd7e111a7 100644 --- a/meta-oe/recipes-devtools/guider/guider_3.9.6.bb +++ b/meta-oe/recipes-devtools/guider/guider_3.9.6.bb | |||
@@ -16,7 +16,7 @@ SRCREV = "fef25c41efb9bde0614ea477d0b90bd9565ae0b4" | |||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | R = "${RECIPE_SYSROOT}" | 17 | R = "${RECIPE_SYSROOT}" |
18 | 18 | ||
19 | inherit distutils | 19 | inherit ${@bb.utils.contains("BBPATH", "meta-python2", "distutils", "", d)} |
20 | 20 | ||
21 | GUIDER_OBJ = "guider.pyc" | 21 | GUIDER_OBJ = "guider.pyc" |
22 | GUIDER_SCRIPT = "guider" | 22 | GUIDER_SCRIPT = "guider" |
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index b52f198bd3..1471c367ff 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb | |||
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" | |||
6 | DEPENDS = "openssl" | 6 | DEPENDS = "openssl" |
7 | DEPENDS_append_class-target = " nodejs-native" | 7 | DEPENDS_append_class-target = " nodejs-native" |
8 | 8 | ||
9 | inherit pkgconfig pythonnative | 9 | inherit pkgconfig ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} |
10 | 10 | ||
11 | COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" | 11 | COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" |
12 | COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" | 12 | COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" |
diff --git a/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb index e229bf424c..f648332b43 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs_60.9.0.bb | |||
@@ -30,7 +30,7 @@ SRC_URI[sha256sum] = "9f453c8cc5669e46e38f977764d49a36295bf0d023619d9aac782e6bb3 | |||
30 | 30 | ||
31 | S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" | 31 | S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" |
32 | 32 | ||
33 | inherit autotools pkgconfig perlnative pythonnative | 33 | inherit autotools pkgconfig perlnative ${@bb.utils.contains("BBPATH", "meta-python2", "pythonnative", "", d)} |
34 | 34 | ||
35 | inherit features_check | 35 | inherit features_check |
36 | CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" | 36 | CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" |
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb index 1ee6b346fe..4a1b6bba69 100644 --- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb +++ b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+" | |||
5 | LIC_FILES_CHKSUM = "file://../COPYING;md5=75859989545e37968a99b631ef42722e" | 5 | LIC_FILES_CHKSUM = "file://../COPYING;md5=75859989545e37968a99b631ef42722e" |
6 | SECTION = "System/Management" | 6 | SECTION = "System/Management" |
7 | 7 | ||
8 | inherit setuptools | 8 | inherit ${@bb.utils.contains("BBPATH", "meta-python2", "setuptools", "", d)} |
9 | 9 | ||
10 | DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem" | 10 | DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem" |
11 | 11 | ||
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 8e5986bd9e..8895a9e158 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/Datera/lio-utils.git \ | |||
12 | SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" | 12 | SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" |
13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
15 | inherit distutils | 15 | inherit ${@bb.utils.contains("BBPATH", "meta-python2", "distutils", "", d)} |
16 | 16 | ||
17 | EXTRA_OEMAKE += "DESTDIR=${D}" | 17 | EXTRA_OEMAKE += "DESTDIR=${D}" |
18 | 18 | ||
@@ -70,3 +70,4 @@ python() { | |||
70 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | 70 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') |
71 | } | 71 | } |
72 | 72 | ||
73 | |||