summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-02-18 10:23:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-03 14:34:10 +0000
commit6e9632e9798d78587c9317554c5547ab3b53837c (patch)
treed9966c3fb4c322c10025af6a3a8ad6cc0577b560 /meta
parent59a85d3a95b54d4e099dbf5ad307893119ed58d9 (diff)
downloadpoky-6e9632e9798d78587c9317554c5547ab3b53837c.tar.gz
lib/oe/package_manager: support exclusion from complementary glob process by regex
Sometimes you do not want certain packages to be installed when installing complementary packages, e.g. when using dev-pkgs in IMAGE_FEATURES you may not want to install all packages from a particular multilib. This introduces a new PACKAGE_EXCLUDE_COMPLEMENTARY variable to allow specifying regexes to match packages to exclude. (From OE-Core master rev: d4fe8f639d87d5ff35e50d07d41d0c1e9f12c4e3) (From OE-Core rev: e848484989307ae6826ba0f5217f7702322181e3) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/package_manager.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 8609156ca2..411b9d6309 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -531,6 +531,9 @@ class PackageManager(object):
531 cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), 531 cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"),
532 "glob", self.d.getVar('PKGDATA_DIR', True), installed_pkgs_file, 532 "glob", self.d.getVar('PKGDATA_DIR', True), installed_pkgs_file,
533 globs] 533 globs]
534 exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True)
535 if exclude:
536 cmd.extend(['-x', exclude])
534 try: 537 try:
535 bb.note("Installing complementary packages ...") 538 bb.note("Installing complementary packages ...")
536 complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT) 539 complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT)