add variable INSTALL_ALL to install all packages in recipes

index bf87547..e43f773 100755
@@ -27,6 +27,7 @@ import fnmatch
 import re
 import optparse
 from collections import defaultdict
+import codecs
 
 def glob(args, usage, debug=False):
     if len(args) < 3:

@@ -234,6 +235,19 @@ def lookup_recipe(args, usage, debug=False):
         print('ERROR: Unable to find pkgdata directory %s' % pkgdata_dir)
         sys.exit(1)
 
+    # If the pkg not generated, search the rprovides to replace
+    rprovides = collect_rprovides(pkgdata_dir)
+    for pkg in pkgs[:]:
+        pkgfile = os.path.join(pkgdata_dir, 'runtime', pkg)
+        if not os.path.exists(pkgfile):
+            for newpkg, oldpkg in rprovides.items():
+                if oldpkg == pkg:
+                    if debug:
+                        print('%s rprovides %s' % (newpkg, pkg))
+                    pkgs.remove(pkg)
+                    pkgs.append(newpkg)
+                    break
+
     mappings = defaultdict(list)
     for pkg in pkgs:
         pkgfile = os.path.join(pkgdata_dir, 'runtime-reverse', pkg)

@@ -254,6 +268,46 @@ def lookup_recipe(args, usage, debug=False):
         items.extend(mappings.get(pkg, []))
     print '\n'.join(items)
 
+def collect_rprovides(pkgdata_dir):
+    def read_pkgdatafile(fn):
+        pkgdata = {}
+        def decode(str):
+            c = codecs.getdecoder("string_escape")
+            return c(str)[0]
+
+        if os.access(fn, os.R_OK):
+            import re
+            f = open(fn, 'r')
+            lines = f.readlines()
+            f.close()
+            r = re.compile("([^:]+):\s*(.*)")
+            for l in lines:
+                m = r.match(l)
+                if m:
+                    pkgdata[m.group(1)] = decode(m.group(2))
+        return pkgdata
+
+    rprovides_dict = dict()
+    if os.path.exists(pkgdata_dir):
+        for root, dirs, files in os.walk("%s/runtime" % pkgdata_dir):
+            for pkgname in files:
+                pkgdatafile = "%s/%s" % (root, pkgname)
+                if not os.access("%s.packaged" % pkgdatafile, os.R_OK):
+                    continue
+
+                try:
+                    sdata = read_pkgdatafile(pkgdatafile)
+                    rprovides = sdata.get('RPROVIDES_%s' % pkgname)
+                    if rprovides:
+                        rprovides_dict[pkgname] = rprovides
+
+                except Exception as e:
+                    print("ERROR:%s: Failed to read pkgdata file %s: %s: %s" %
+                          (pkgname, pkgdatafile, e.__class__, str(e)))
+                    sys.exit(1)
+
+    return rprovides_dict
+
 def find_path(args, usage, debug=False):
     if len(args) < 2:
         usage()

index e43f773..984f66e 100755
@@ -28,6 +28,7 @@ import re
 import optparse
 from collections import defaultdict
 import codecs
+import errno
 
 def glob(args, usage, debug=False):
     if len(args) < 3:

@@ -308,6 +309,46 @@ def collect_rprovides(pkgdata_dir):
 
     return rprovides_dict
 
+def list_packages(args, usage, debug=False):
+    if len(args) < 2:
+        usage()
+        sys.exit(1)
+
+    pkgdata_dir = args[0]
+    if not os.path.exists(pkgdata_dir):
+        print('ERROR: Unable to find pkgdata directory %s' % pkgdata_dir)
+        sys.exit(1)
+
+    if len(args[1].split()) != 1:
+        print('ERROR: Only one recipe name is acceptable')
+        sys.exit(1)
+
+    recipe = args[1]
+    packages = ""
+    try:
+        with open(os.path.join(pkgdata_dir, recipe)) as f:
+            for line in f.readlines():
+                if line.startswith('PACKAGES: '):
+                    packages = line.split(': ', 1)[1].split()
+                    break
+    except IOError as e:
+        if e.errno == errno.ENOENT:
+            print('ERROR: The recipe %s does not exist' % recipe)
+            sys.exit(1)
+        else:
+            raise
+
+    # Filter out packages that not generated
+    for pkg in packages[:]:
+        flag_packaged = "%s/runtime/%s.packaged" % (pkgdata_dir, pkg)
+        if not os.access(flag_packaged, os.R_OK):
+            if debug:
+                print("%s not produced by %s" % (pkg, recipe))
+            packages.remove(pkg)
+
+    print '\n'.join(packages)
+
+
 def find_path(args, usage, debug=False):
     if len(args) < 2:
         usage()

@@ -354,7 +395,9 @@ Available commands:
         find the package providing the specified path (wildcards * ? allowed)
     read-value <pkgdatadir> <value-name> "<pkgs>"
         read the named value from the pkgdata files for the specified
-        packages''')
+        packages
+    list-packages <pkgdatadir> "<recipe>"
+        list all packages produced by the particular recipe''')
 
     parser.add_option("-d", "--debug",
             help = "Enable debug output",

@@ -377,6 +420,8 @@ Available commands:
         find_path(args[1:], parser.print_help, options.debug)
     elif args[0] == "read-value":
         read_value(args[1:], parser.print_help, options.debug)
+    elif args[0] == "list-packages":
+        list_packages(args[1:], parser.print_help, options.debug)
     else:
         parser.print_help()
         sys.exit(1)

index 2c1f63f..3163fbd 100644
@@ -204,6 +204,8 @@ FILES_${PN}-pyvenv += "${bindir}/pyvenv-${PYTHON_MAJMIN} ${bindir}/pyvenv"
 PACKAGES =+ "libpython3 libpython3-staticdev"
 FILES_libpython3 = "${libdir}/libpython*.so.*"
 FILES_libpython3-staticdev += "${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_BINABI}/libpython${PYTHON_BINABI}.a"
+DEBIAN_NOAUTONAME_libpython3 = "1"
+DEBIAN_NOAUTONAME_libpython3-staticdev = "1"
 
 # catch debug extensions (isn't that already in python-core-dbg?)
 FILES_${PN}-dbg += "${libdir}/python${PYTHON_MAJMIN}/lib-dynload/.debug"

index 07e7f99..8c7df9a 100644
@@ -54,6 +54,16 @@ def check_image_features(d):
         if feature not in valid_features:
             bb.fatal("'%s' in IMAGE_FEATURES is not a valid image feature. Valid features: %s" % (feature, ' '.join(valid_features)))
 
+# Assign INSTALL_ALL ?= "1" means:
+# 1) According to the packages listed in PACKAGE_INSTALL, figure out recipes
+#    which produced them by invoking script oe-pkgdata-util;
+# 2) Go on invoking script oe-pkgdata-util to list all available packages in
+#    these recipes except *-(doc|dbg|dev|staticdev|locale|ptest), and use them
+#    to replace packages in PACKAGE_INSTALL;
+# 3) INSTALL_ALL is a global switch for all packages listed in PACKAGE_INSTALL,
+#    you also could assign INSTALL_ALL_pkgname ?= "1" for the particular
+#    package in PACKAGE_INSTALL.
+INSTALL_ALL ?= "0"
 IMAGE_INSTALL ?= ""
 IMAGE_INSTALL[type] = "list"
 export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}"

@@ -95,9 +105,16 @@ def rootfs_variables(d):
                  'SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT','SDKTARGETSYSROOT','MULTILIBRE_ALLOW_REP',
                  'MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS',
                  'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','BUILDNAME','USE_DEVFS',
-                 'STAGING_KERNEL_DIR','COMPRESSIONTYPES']
+                 'STAGING_KERNEL_DIR','COMPRESSIONTYPES', 'INSTALL_ALL']
     variables.extend(command_variables(d))
     variables.extend(variable_depends(d))
+
+    for pkg in (d.getVar('PACKAGE_INSTALL', True) or '').split():
+        installall_var = 'INSTALL_ALL_%s' % pkg
+        installall_val = d.getVar(installall_var, True)
+        if installall_val and installall_var not in variables:
+            variables.append(installall_var)
+
     return " ".join(variables)
 
 do_rootfs[vardeps] += "${@rootfs_variables(d)}"

76 lines not on this page · raw message