Skip to contentSkip to conversation

python: don't wipe RDEPENDS when parsing manifest

PATCH New Ross Burton 1 participant 2 messages Oct 15, 2018

lore
Share & tools
lore

Ross Burton

author
#0 lore raw

PATCH 1/2 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.

Signed-off-by Ross Burton <[email protected]>
---
 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(-)
meta/recipes-devtools/python/python3_3.5.6.bb +2 -1
index 372f27b15dc..72478f8663d 100644
@@ -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:
meta/recipes-devtools/python/python_2.7.15.bb +2 -1
index e3a4ddb3274..d78400b6e61 100644
@@ -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:
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 python: remove the PN package entirely

Nothing should be in this package, so remove it entirely to be sure nothing does end up in there.

Signed-off-by Ross Burton <[email protected]>
---
 meta/recipes-devtools/python/python3_3.5.6.bb | 4 ++--
 meta/recipes-devtools/python/python_2.7.15.bb | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
meta/recipes-devtools/python/python3_3.5.6.bb +2 -2
index 72478f8663d..2a4547694ae 100644
@@ -215,6 +215,8 @@ py_package_preprocess () {
 	mv ${PKGD}/${bindir}/python${PYTHON_BINABI}-config ${PKGD}/${bindir}/python${PYTHON_BINABI}-config-${MULTILIB_SUFFIX}
 }
 
+PACKAGES_remove = "${PN}"
+
 # manual dependency additions
 RPROVIDES_${PN}-modules = "${PN}"
 RRECOMMENDS_${PN}-core_append_class-nativesdk = " nativesdk-python3-modules"

@@ -249,8 +251,6 @@ RDEPENDS_${PN}-dev = ""
 
 BBCLASSEXTEND = "nativesdk"
 
-RPROVIDES_${PN} += "${PN}-modules"
-
 # We want bytecode precompiled .py files (.pyc's) by default
 # but the user may set it on their own conf
 INCLUDE_PYCS ?= "1"
meta/recipes-devtools/python/python_2.7.15.bb +1 -2
index d78400b6e61..b402ad6f1e7 100644
@@ -152,6 +152,7 @@ py_package_preprocess () {
 	(cd ${PKGD}; python -m py_compile ./${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py)
 }
 
+PACKAGES_remove = "${PN}"
 
 # manual dependency additions
 RPROVIDES_${PN}-core = "${PN}"

@@ -181,8 +182,6 @@ RDEPENDS_${PN}-dev = ""
 
 BBCLASSEXTEND = "nativesdk"
 
-RPROVIDES_${PN} += "${PN}-modules"
-
 # We want bytecode precompiled .py files (.pyc's) by default
 # but the user may set it on their own conf
Signature · 1 line
2.11.0