aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2016-10-05 17:30:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-05 23:22:33 +0100
commitac4ca41d3a27356d46c0c39053e74d3519b24c44 (patch)
tree032f09d458555ad826f0836cc6ab0285170b17bb
parentdadb84936b3672dcf07e5ab8226158136762801f (diff)
downloadopenembedded-core-contrib-ac4ca41d3a27356d46c0c39053e74d3519b24c44.tar.gz
openembedded-core-contrib-ac4ca41d3a27356d46c0c39053e74d3519b24c44.tar.bz2
openembedded-core-contrib-ac4ca41d3a27356d46c0c39053e74d3519b24c44.zip
package_manager.py: Allow a leading - in PACKAGE_EXCLUDE_COMPLEMENTARY
This allows a regular expression specified in PACKAGE_EXCLUDE_COMPLEMENTARY to have a leading dash. Without this, the dash was treated by oe-pkgdata-util as the beginning of a command line argument. E.g., if PACKAGE_EXCLUDE_COMPLEMENTARY = "-foo$", it resulted in an error like: ERROR: <imagename>-1.0-r0 do_populate_sdk: Could not compute complementary packages list. Command '<topdir>/scripts/oe-pkgdata-util -p <builddir>/tmp/sysroots/<machine>/pkgdata glob <workdir>/installed_pkgs.txt *-dev *-dbg -x -foo$' returned 2: ERROR: argument -x/--exclude: expected one argument usage: oe-pkgdata-util glob [-h] [-x EXCLUDE] pkglistfile glob [glob ...] 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 434b898d3d8..5f86affab29 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(['-x', exclude])
+ cmd.extend(['--exclude=' + exclude])
try:
bb.note("Installing complementary packages ...")
bb.note('Running %s' % cmd)