From: Peter Kjellerstedt Date: Wed, 5 Oct 2016 15:30:46 +0000 (+0200) Subject: package_manager.py: Allow multiple regexps in PACKAGE_EXCLUDE_COMPLEMENTARY X-Git-Tag: 2016-10~102 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a5f7e98a94e96d40b1276c85249619aa8d7be847;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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): 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)