diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-02-16 17:57:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-17 14:20:45 +0000 |
| commit | fdb5639e906779814e8454b8fc696c25e8c7a870 (patch) | |
| tree | c6f81c2538306d0ee2a593146e8e7c01038c92e6 /meta/lib | |
| parent | 3d2d158e34224dff7ec27be341044332798c5e32 (diff) | |
| download | ast2050-yocto-poky-fdb5639e906779814e8454b8fc696c25e8c7a870.zip ast2050-yocto-poky-fdb5639e906779814e8454b8fc696c25e8c7a870.tar.gz | |
lib/oe/package_manager: support exclusion from complementary glob process by regex
Sometimes you do not want certain packages to be installed when
installing complementary packages, e.g. when using dev-pkgs in
IMAGE_FEATURES you may not want to install all packages from a
particular multilib. This introduces a new PACKAGE_EXCLUDE_COMPLEMENTARY
variable to allow specifying regexes to match packages to exclude.
(From OE-Core rev: d4fe8f639d87d5ff35e50d07d41d0c1e9f12c4e3)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/pkgdata.py | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index fcf05dc..986ae54 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -531,6 +531,9 @@ class PackageManager(object): cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file, globs] + exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True) + if exclude: + cmd.extend(['-x', exclude]) try: bb.note("Installing complementary packages ...") complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT) diff --git a/meta/lib/oeqa/selftest/pkgdata.py b/meta/lib/oeqa/selftest/pkgdata.py index f689bf3..34eea46 100644 --- a/meta/lib/oeqa/selftest/pkgdata.py +++ b/meta/lib/oeqa/selftest/pkgdata.py @@ -207,6 +207,11 @@ class OePkgdataUtilTests(oeSelfTest): # The following should not error (because when we use this during rootfs construction, sometimes the complementary package won't exist) result = runCmd('oe-pkgdata-util glob %s "*-nonexistent"' % pkglistfile) self.assertEqual(result.output, '') + # Test exclude option + result = runCmd('oe-pkgdata-util glob %s "*-dev *-dbg" -x "^libz"' % pkglistfile) + resultlist = result.output.split() + self.assertNotIn('libz-dev', resultlist) + self.assertNotIn('libz-dbg', resultlist) def test_specify_pkgdatadir(self): result = runCmd('oe-pkgdata-util -p %s lookup-pkg glibc' % get_bb_var('PKGDATA_DIR')) |
