summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-10-15 19:13:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-16 20:35:43 +0100
commit04370c671eafb193d03ed1d48584c6aa218965ae (patch)
treef4bfe4410fee017b3a49cc6edf9d254bc9ebcc7e
parent2b5d32596b766c4d1dbbc18d8dd879d19950ef82 (diff)
downloadpoky-04370c671eafb193d03ed1d48584c6aa218965ae.tar.gz
python: don't wipe RDEPENDS when parsing manifest
We want to allow the main recipe to extend RDEPENDS directly, so don't wipe RDEPENDS when reading the manifest. This fixes the missing python-misc dependency from python-modules. As the wiping was having the good side-effect of removing the PN-dev dependency on PN (which doesn't exist), clear RDEPENDS_${PN}-dev. (From OE-Core rev: fe3727af217dce4488f1fc6aab3f66232cf11fea) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python3_3.5.6.bb3
-rw-r--r--meta/recipes-devtools/python/python_2.7.15.bb3
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb
index 372f27b15d..72478f8663 100644
--- a/meta/recipes-devtools/python/python3_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3_3.5.6.bb
@@ -245,6 +245,8 @@ FILES_${PN}-man = "${datadir}/man"
245 245
246RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2" 246RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2"
247 247
248RDEPENDS_${PN}-dev = ""
249
248BBCLASSEXTEND = "nativesdk" 250BBCLASSEXTEND = "nativesdk"
249 251
250RPROVIDES_${PN} += "${PN}-modules" 252RPROVIDES_${PN} += "${PN}-modules"
@@ -288,7 +290,6 @@ python(){
288 for value in python_manifest[key]['cached']: 290 for value in python_manifest[key]['cached']:
289 d.appendVar('FILES_' + pypackage, ' ' + value) 291 d.appendVar('FILES_' + pypackage, ' ' + value)
290 292
291 d.setVar('RDEPENDS_' + pypackage, '')
292 for value in python_manifest[key]['rdepends']: 293 for value in python_manifest[key]['rdepends']:
293 # Make it work with or without $PN 294 # Make it work with or without $PN
294 if '${PN}' in value: 295 if '${PN}' in value:
diff --git a/meta/recipes-devtools/python/python_2.7.15.bb b/meta/recipes-devtools/python/python_2.7.15.bb
index e3a4ddb327..d78400b6e6 100644
--- a/meta/recipes-devtools/python/python_2.7.15.bb
+++ b/meta/recipes-devtools/python/python_2.7.15.bb
@@ -177,6 +177,8 @@ FILES_${PN}-man = "${datadir}/man"
177# Nasty but if bdb isn't enabled the package won't be generated 177# Nasty but if bdb isn't enabled the package won't be generated
178RDEPENDS_${PN}-modules_remove = "${@bb.utils.contains('PACKAGECONFIG', 'bdb', '', '${PN}-bsddb', d)}" 178RDEPENDS_${PN}-modules_remove = "${@bb.utils.contains('PACKAGECONFIG', 'bdb', '', '${PN}-bsddb', d)}"
179 179
180RDEPENDS_${PN}-dev = ""
181
180BBCLASSEXTEND = "nativesdk" 182BBCLASSEXTEND = "nativesdk"
181 183
182RPROVIDES_${PN} += "${PN}-modules" 184RPROVIDES_${PN} += "${PN}-modules"
@@ -220,7 +222,6 @@ python(){
220 if value.endswith('.py'): 222 if value.endswith('.py'):
221 d.appendVar('FILES_' + pypackage, ' ' + value + 'c') 223 d.appendVar('FILES_' + pypackage, ' ' + value + 'c')
222 224
223 d.setVar('RDEPENDS_' + pypackage, '')
224 for value in python_manifest[key]['rdepends']: 225 for value in python_manifest[key]['rdepends']:
225 # Make it work with or without $PN 226 # Make it work with or without $PN
226 if '${PN}' in value: 227 if '${PN}' in value: