diff options
author | Ross Burton <ross.burton@intel.com> | 2019-02-13 13:25:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-15 08:17:49 +0000 |
commit | f7247043b1b42a8109f42f7bf79b6f66df04b413 (patch) | |
tree | 23c68e4826280c39beb4bd8f537a45fa568fcc4e /meta | |
parent | cdd0683e5e39c52d3d715805739940e3566f6c7c (diff) | |
download | poky-f7247043b1b42a8109f42f7bf79b6f66df04b413.tar.gz |
gstreamer: improve metadata dependencies
Instead of maintaining its own copy of the 'system' packages, reuse
oe.utils.packages_filter_out_system().
This stops ${PN}-src being added to the meta package, which meant anything
depending on the meta package was also pulling in the sources.
(From OE-Core rev: 32dc827dae50d818477c299d7adee9f444f6afb7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc index c995e29e09..6781e98c31 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc | |||
@@ -15,17 +15,17 @@ python split_gstreamer10_packages () { | |||
15 | 15 | ||
16 | python set_metapkg_rdepends () { | 16 | python set_metapkg_rdepends () { |
17 | import os | 17 | import os |
18 | import oe.utils | ||
18 | 19 | ||
19 | pn = d.getVar('PN') | 20 | pn = d.getVar('PN') |
20 | metapkg = pn + '-meta' | 21 | metapkg = pn + '-meta' |
21 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") | 22 | d.setVar('ALLOW_EMPTY_' + metapkg, "1") |
22 | d.setVar('FILES_' + metapkg, "") | 23 | d.setVar('FILES_' + metapkg, "") |
23 | blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ] | 24 | blacklist = [ pn, pn + '-meta' ] |
24 | metapkg_rdepends = [] | 25 | metapkg_rdepends = [] |
25 | packages = d.getVar('PACKAGES').split() | ||
26 | pkgdest = d.getVar('PKGDEST') | 26 | pkgdest = d.getVar('PKGDEST') |
27 | for pkg in packages[1:]: | 27 | for pkg in oe.utils.packages_filter_out_system(d): |
28 | if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'): | 28 | if pkg not in blacklist and pkg not in metapkg_rdepends: |
29 | # See if the package is empty by looking at the contents of its PKGDEST subdirectory. | 29 | # See if the package is empty by looking at the contents of its PKGDEST subdirectory. |
30 | # If this subdirectory is empty, then the package is. | 30 | # If this subdirectory is empty, then the package is. |
31 | # Empty packages do not get added to the meta package's RDEPENDS | 31 | # Empty packages do not get added to the meta package's RDEPENDS |