summaryrefslogtreecommitdiffstats
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-06 07:51:00 +0100
commitd067b0e1e48a4efadb94e0d855608f0c19b43a16 (patch)
tree126a92ef990765169005bfd92ec780791ae9ccc6
parent2334201960020e8495891148c89d6c16e0414b0a (diff)
downloadpoky-d067b0e1e48a4efadb94e0d855608f0c19b43a16.tar.gz
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" (From OE-Core rev: a5f7e98a94e96d40b1276c85249619aa8d7be847) 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 5f86affab2..3cee9730a8 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -598,7 +598,7 @@ class PackageManager(object, metaclass=ABCMeta):
598 globs] 598 globs]
599 exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True) 599 exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True)
600 if exclude: 600 if exclude:
601 cmd.extend(['--exclude=' + exclude]) 601 cmd.extend(['--exclude=' + '|'.join(exclude.split())])
602 try: 602 try:
603 bb.note("Installing complementary packages ...") 603 bb.note("Installing complementary packages ...")
604 bb.note('Running %s' % cmd) 604 bb.note('Running %s' % cmd)