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

[Emmanuele Bassi <ebassi src gnome org>]

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

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

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