[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6152/8267] python3: add python3-modules-native to RPROVIDES for python3-native



commit f1333958ddf7d133437baeddae42781fdc03a7c7
Author: Ross Burton <ross burton intel com>
Date:   Fri Jun 2 17:36:24 2017 +0100

    python3: add python3-modules-native to RPROVIDES for python3-native
    
    Also clean up the logic in the script to be more Pythonic.
    
    (From OE-Core rev: fae66dd3633aa8a6aa633fcfd7c4b9a728dee7a4)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../python/python-native-3.5-manifest.inc          |    4 ++--
 scripts/contrib/python/generate-manifest-3.5.py    |   10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/meta/recipes-devtools/python/python-native-3.5-manifest.inc 
b/meta/recipes-devtools/python/python-native-3.5-manifest.inc
index 10be3e9..f1f732e 100644
--- a/meta/recipes-devtools/python/python-native-3.5-manifest.inc
+++ b/meta/recipes-devtools/python/python-native-3.5-manifest.inc
@@ -1,10 +1,10 @@
 
 # WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file.
-# Generator: '../../../scripts/contrib/python/generate-manifest-3.5.py --native' Version 20140131 (C) 
2002-2010 Michael 'Mickey' Lauer <mlauer vanille-media de>
+# Generator: '../scripts/contrib/python/generate-manifest-3.5.py --native' Version 20140131 (C) 2002-2010 
Michael 'Mickey' Lauer <mlauer vanille-media de>
 
  
 
-RPROVIDES+="python3-2to3-native python3-argparse-native python3-asyncio-native python3-audio-native 
python3-codecs-native python3-compile-native python3-compression-native python3-core-native 
python3-crypt-native python3-ctypes-native python3-curses-native python3-datetime-native python3-db-native 
python3-debugger-native python3-dev-native python3-difflib-native python3-distutils-native 
python3-distutils-staticdev-native python3-doctest-native python3-email-native python3-enum-native 
python3-fcntl-native python3-gdbm-native python3-html-native python3-idle-native python3-image-native 
python3-importlib-native python3-io-native python3-json-native python3-lang-native python3-logging-native 
python3-mailbox-native python3-math-native python3-mime-native python3-mmap-native 
python3-multiprocessing-native python3-netclient-native python3-netserver-native python3-numbers-native 
python3-pickle-native python3-pkgutil-native python3-pprint-native python3-profile-native python3-pydoc-n
 ative python3-re-native python3-readline-native python3-reprlib-native python3-resource-native 
python3-selectors-native python3-shell-native python3-signal-native python3-smtpd-native 
python3-sqlite3-native python3-sqlite3-tests-native python3-stringold-native python3-subprocess-native 
python3-syslog-native python3-terminal-native python3-tests-native python3-textutils-native 
python3-threading-native python3-tkinter-native python3-typing-native python3-unittest-native 
python3-unixadmin-native python3-xml-native python3-xmlrpc-native "
+RPROVIDES += "python3-modules-native python3-2to3-native python3-argparse-native python3-asyncio-native 
python3-audio-native python3-codecs-native python3-compile-native python3-compression-native 
python3-core-native python3-crypt-native python3-ctypes-native python3-curses-native python3-datetime-native 
python3-db-native python3-debugger-native python3-dev-native python3-difflib-native python3-distutils-native 
python3-distutils-staticdev-native python3-doctest-native python3-email-native python3-enum-native 
python3-fcntl-native python3-gdbm-native python3-html-native python3-idle-native python3-image-native 
python3-importlib-native python3-io-native python3-json-native python3-lang-native python3-logging-native 
python3-mailbox-native python3-math-native python3-mime-native python3-mmap-native 
python3-multiprocessing-native python3-netclient-native python3-netserver-native python3-numbers-native 
python3-pickle-native python3-pkgutil-native python3-pprint-native python3-profi
 le-native python3-pydoc-native python3-re-native python3-readline-native python3-reprlib-native 
python3-resource-native python3-selectors-native python3-shell-native python3-signal-native 
python3-smtpd-native python3-sqlite3-native python3-sqlite3-tests-native python3-stringold-native 
python3-subprocess-native python3-syslog-native python3-terminal-native python3-tests-native 
python3-textutils-native python3-threading-native python3-tkinter-native python3-typing-native 
python3-unittest-native python3-unixadmin-native python3-xml-native python3-xmlrpc-native"
 
 
 
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py
index a8b5059..0de8fed 100755
--- a/scripts/contrib/python/generate-manifest-3.5.py
+++ b/scripts/contrib/python/generate-manifest-3.5.py
@@ -87,13 +87,11 @@ class MakefileMaker:
         #
 
         if self.isNative:
-            rprovideLine = 'RPROVIDES+="'
-            for name in sorted(self.packages):
-                rprovideLine += "%s-native " % name.replace( '${PN}', 'python3' )
-            rprovideLine += '"'
+            pkglist = []
+            for name in ['${PN}-modules'] + sorted(self.packages):
+                pkglist.append('%s-native' % name.replace('${PN}', 'python3'))
 
-            self.out( rprovideLine )
-            self.out( "" )
+            self.out('RPROVIDES += "%s"' % " ".join(pkglist))
             return
 
         #


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]