From 04370c671eafb193d03ed1d48584c6aa218965ae Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 15 Oct 2018 19:13:01 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python3_3.5.6.bb | 3 ++- meta/recipes-devtools/python/python_2.7.15.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/python') 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" RDEPENDS_${PN}-ptest = "${PN}-modules ${PN}-tests unzip bzip2" +RDEPENDS_${PN}-dev = "" + BBCLASSEXTEND = "nativesdk" RPROVIDES_${PN} += "${PN}-modules" @@ -288,7 +290,6 @@ python(){ for value in python_manifest[key]['cached']: d.appendVar('FILES_' + pypackage, ' ' + value) - d.setVar('RDEPENDS_' + pypackage, '') for value in python_manifest[key]['rdepends']: # Make it work with or without $PN 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" # Nasty but if bdb isn't enabled the package won't be generated RDEPENDS_${PN}-modules_remove = "${@bb.utils.contains('PACKAGECONFIG', 'bdb', '', '${PN}-bsddb', d)}" +RDEPENDS_${PN}-dev = "" + BBCLASSEXTEND = "nativesdk" RPROVIDES_${PN} += "${PN}-modules" @@ -220,7 +222,6 @@ python(){ if value.endswith('.py'): d.appendVar('FILES_' + pypackage, ' ' + value + 'c') - d.setVar('RDEPENDS_' + pypackage, '') for value in python_manifest[key]['rdepends']: # Make it work with or without $PN if '${PN}' in value: -- cgit v1.2.3-54-g00ecf