[1/3] python: don't wipe RDEPENDS when parsing manifest

Message ID 20181012115502.14205-1-ross.burton@intel.com
State New
Headers show
Series
  • [1/3] python: don't wipe RDEPENDS when parsing manifest
Related show

Commit Message

Ross Burton Oct. 12, 2018, 11:55 a.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/recipes-devtools/python/python3_3.5.6.bb | 1 -
 meta/recipes-devtools/python/python_2.7.15.bb | 1 -
 2 files changed, 2 deletions(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Richard Purdie Oct. 14, 2018, 8:49 a.m. | #1
On Fri, 2018-10-12 at 12:55 +0100, Ross Burton wrote:
> 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.

> 

> Signed-off-by: Ross Burton <ross.burton@intel.com>

> ---

>  meta/recipes-devtools/python/python3_3.5.6.bb | 1 -

>  meta/recipes-devtools/python/python_2.7.15.bb | 1 -

>  2 files changed, 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 e1796581342..489baa294fd 100644

> --- a/meta/recipes-devtools/python/python3_3.5.6.bb

> +++ b/meta/recipes-devtools/python/python3_3.5.6.bb

> @@ -285,7 +285,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 472c1da4bf7..f30d3f4d25c 100644

> --- a/meta/recipes-devtools/python/python_2.7.15.bb

> +++ b/meta/recipes-devtools/python/python_2.7.15.bb

> @@ -240,7 +240,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:


FWIW its actually this patch which is causing the build failures...

I did remember that rpm may detect python scripts and add a python
dependency which may be confusing things...

Cheers,

Richard

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/python/python3_3.5.6.bb b/meta/recipes-devtools/python/python3_3.5.6.bb
index e1796581342..489baa294fd 100644
--- a/meta/recipes-devtools/python/python3_3.5.6.bb
+++ b/meta/recipes-devtools/python/python3_3.5.6.bb
@@ -285,7 +285,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 472c1da4bf7..f30d3f4d25c 100644
--- a/meta/recipes-devtools/python/python_2.7.15.bb
+++ b/meta/recipes-devtools/python/python_2.7.15.bb
@@ -240,7 +240,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: