Resolve gdb-cross-canadian dependency on imp

Add imp to python3-importlib. Make gdb-cross-canadian depend on nativesdk-python3-importlib when python is enabled.

Changed since v1:
Cherry picked patch that changes generate-manifest-3.5.py to add imp to importlib

The following changes since commit 55c835c73cc41b6fc809c941c295d62a612e49e0:

build-appliance-image: Update to morty head revision (2017-02-08 12:00:29 +0000)

are available in the git repository at:

git://github.com/gmccollister/openembedded-core morty-gdb-cross-canadian
https://github.com/gmccollister/openembedded-core/tree/morty-gdb-cross-canadian

Anders Darander (1):
python-3-manifest: fix adding imp to importlib

George McCollister (2):
python-3.5-manifest: Add imp to importlib
gdb-cross-canadian: Depend on nativesdk-python3-importlib

 meta/recipes-devtools/gdb/gdb-cross-canadian.inc     | 3 ++-
 meta/recipes-devtools/python/python-3.5-manifest.inc | 2 +-
 scripts/contrib/python/generate-manifest-3.5.py      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

2.8.0

The imp python module is the forerunner of importlib. Include imp in the importlib subpackage instead of the misc subpackage so that it can be depended on without bringing in a bunch of unrelated, unused modules.

---
 meta/recipes-devtools/python/python-3.5-manifest.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 3046114..6c690db 100644
@@ -115,7 +115,7 @@ FILES_${PN}-image="${libdir}/python3.5/colorsys.* ${libdir}/python3.5/imghdr.* $
 
 SUMMARY_${PN}-importlib="Python import implementation library"
 RDEPENDS_${PN}-importlib="${PN}-core ${PN}-lang"
-FILES_${PN}-importlib="${libdir}/python3.5/importlib "
+FILES_${PN}-importlib="${libdir}/python3.5/importlib ${libdir}/python3.5/imp.* "
 
 SUMMARY_${PN}-io="Python low-level I/O"
 RDEPENDS_${PN}-io="${PN}-core ${PN}-math"

2.8.0

Add missing dependency on nativesdk-python3-importlib so the imp Python module is installed.

Before this patch, running gdb from the sdk would give the following error:

Python Exception <class 'ImportError'> No module named 'imp':

---
 meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index e53081d..3ff1989 100644
@@ -14,7 +14,8 @@ GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 PACKAGECONFIG ??= "python readline"
 PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \
                          nativesdk-python3-core nativesdk-python3-lang nativesdk-python3-re \
-                         nativesdk-python3-codecs nativesdk-python3-netclient"
+                         nativesdk-python3-codecs nativesdk-python3-netclient \
+                         nativesdk-python3-importlib"
 PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nativesdk-readline"
 
 SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"

2.8.0

From: Anders Darander <[email protected]>

Commit: 512334f102a33833d39af53467894315f0715d07
"python-3.5-manifest: Add imp to importlib"

added imp to importlib in the generated manifest, but not in the generator script.

---
 scripts/contrib/python/generate-manifest-3.5.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 2906cc6..71a71f7 100755
@@ -269,7 +269,7 @@ if __name__ == "__main__":
     "formatter.* htmlentitydefs.* htmllib.* markupbase.* sgmllib.* HTMLParser.* " )
 
     m.addPackage( "${PN}-importlib", "Python import implementation library", "${PN}-core ${PN}-lang",
-    "importlib" )
+    "importlib imp.*" )
 
     m.addPackage( "${PN}-gdbm", "Python GNU database support", "${PN}-core",
     "lib-dynload/_gdbm.*.so" )

2.8.0