diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2016-10-05 17:30:45 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-06 07:51:00 +0100 |
commit | 2334201960020e8495891148c89d6c16e0414b0a (patch) | |
tree | 4d8274c1e5a752f63c170b4cf981e26000b7aa36 /meta | |
parent | b16001f3e2d54a6b35f185b5ff71bcb797fa7e0d (diff) | |
download | poky-2334201960020e8495891148c89d6c16e0414b0a.tar.gz |
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 ...]
(From OE-Core rev: ac4ca41d3a27356d46c0c39053e74d3519b24c44)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/package_manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 434b898d3d..5f86affab2 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(['-x', exclude]) | 601 | cmd.extend(['--exclude=' + exclude]) |
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) |