summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2015-02-21 04:01:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-24 17:41:44 +0000
commit4d83a90bfb5a41deb81ca8878363a89fccf95d89 (patch)
tree32b1a485232717ec378abc4283041284125ad6cd
parentd861cc4b0493954355b32035c084bfed47d455ac (diff)
downloadpoky-4d83a90bfb5a41deb81ca8878363a89fccf95d89.tar.gz
gst-plugins-package.inc: Avoid dependency on ${PN} from ${PN}-<plugin>
A recent change to this file added a runtime dependency from ${PN} on ${PN}-meta since users tend to believe that installing the main package will bring in all of the individual plugin packages, which previously was not the case. However, since all plugin packages had a dependency on the main package, this caused all plugin packages to be pulled in whenever one plugin package was installed... Since the main package is now guaranteed to be empty, there is no reason for the plugin packages to depend on it any more. (From OE-Core rev: 29143391029bdb1a5b23724017acb363b11ed6a8) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-package.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
index bc33b0e5a5..cb1be06d09 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -7,7 +7,7 @@ python split_gstreamer10_packages () {
7 glibdir = d.getVar('libdir', True) 7 glibdir = d.getVar('libdir', True)
8 8
9 do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) 9 do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
10 do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) 10 do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='')
11 do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev')) 11 do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev'))
12 do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev')) 12 do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev'))
13} 13}
@@ -40,8 +40,7 @@ python set_metapkg_rdepends () {
40 d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') 40 d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
41} 41}
42 42
43# metapkg has runtime dependency on PN 43# each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev
44# each plugin depends on PN, plugin-dev on PN-dev, plugin-staticdev on PN-staticdev
45# so we need them even when empty (like in gst-plugins-good case) 44# so we need them even when empty (like in gst-plugins-good case)
46ALLOW_EMPTY_${PN} = "1" 45ALLOW_EMPTY_${PN} = "1"
47ALLOW_EMPTY_${PN}-dev = "1" 46ALLOW_EMPTY_${PN}-dev = "1"