aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-10-05 17:30:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-05 23:22:33 +0100
commita5f7e98a94e96d40b1276c85249619aa8d7be847 (patch)
treeddd20aaa138e4410b23a2b62174bf674ac3dceb6
parentac4ca41d3a27356d46c0c39053e74d3519b24c44 (diff)
downloadopenembedded-core-contrib-a5f7e98a94e96d40b1276c85249619aa8d7be847.tar.gz
openembedded-core-contrib-a5f7e98a94e96d40b1276c85249619aa8d7be847.tar.bz2
openembedded-core-contrib-a5f7e98a94e96d40b1276c85249619aa8d7be847.zip
package_manager.py: Allow multiple regexps in PACKAGE_EXCLUDE_COMPLEMENTARY
The PACKAGE_EXCLUDE_COMPLEMENTARY variable can currently only contain one regular expression. This makes it hard to add to it from different configuration files and recipes. Allowing it to contain multiple, whitespace separated regular expressions should be backwards compatible as it is assumed that whitespace is not used in package names and thus is not used in any existing instances of the variable. After this change, the following three examples should be equivalent: PACKAGE_EXCLUDE_COMPLEMENTARY = "foo|bar" PACKAGE_EXCLUDE_COMPLEMENTARY = "foo bar" PACKAGE_EXCLUDE_COMPLEMENTARY = "foo" PACKAGE_EXCLUDE_COMPLEMENTARY += "bar" Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 5f86affab29..3cee9730a8d 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -598,7 +598,7 @@ class PackageManager(object, metaclass=ABCMeta):
globs]
exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True)
if exclude:
- cmd.extend(['--exclude=' + exclude])
+ cmd.extend(['--exclude=' + '|'.join(exclude.split())])
try:
bb.note("Installing complementary packages ...")
bb.note('Running %s' % cmd)