[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH 1/3] gstreamer: fixed -meta package rdepends
From:       dv () pseudoterminal ! org (Carlos Rafael Giani)
Date:       2013-05-31 19:15:56
Message-ID: 1370027758-22849-2-git-send-email-dv () pseudoterminal ! org
[Download RAW message or body]

The -meta packages were depending on non-existing packages,
like -glib and -apps. The fix checks if packages in the PACKAGES list
are empty. If so, they are omitted from the rdepends list.

Signed-off-by: Carlos Rafael Giani <dv at pseudoterminal.org>
---
 .../gstreamer/gst-plugins-package.inc              | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc \
b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc index 7ae3ef6..5962e4b \
                100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -1,6 +1,8 @@
+PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages "
+PACKAGESPLITFUNCS_append = " set_metapkg_rdepends "
 LIBV = "0.10"
 
-python populate_packages_prepend () {
+python split_gstreamer10_packages () {
     gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}')
     postinst = d.getVar('plugin_postinst', True)
     glibdir = d.getVar('libdir', True)
@@ -9,23 +11,38 @@ python populate_packages_prepend () {
     do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), \
'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}'))  \
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'))  \
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'))
-    
+}
+
+python set_metapkg_rdepends () {
+    import os
+
     pn = d.getVar('PN', True)
     metapkg =  pn + '-meta'
     d.setVar('ALLOW_EMPTY_' + metapkg, "1")
     d.setVar('FILES_' + metapkg, "")
-    blacklist = [ pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc' ]
+    blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + \
'-meta' ]  metapkg_rdepends = []
     packages = d.getVar('PACKAGES', True).split()
+    pkgdest = d.getVar('PKGDEST', True)
     for pkg in packages[1:]:
         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'):
-            metapkg_rdepends.append(pkg)
+            # See if the package is empty by looking at the contents of its PKGDEST \
subdirectory.  +            # If this subdirectory is empty, then the package is.
+            # Empty packages do not get added to the meta package's RDEPENDS
+            pkgdir = os.path.join(pkgdest, pkg)
+            if os.path.exists(pkgdir):
+                dir_contents = os.listdir(pkgdir) or []
+            else:
+                dir_contents = []
+            is_empty = len(dir_contents) == 0
+            if not is_empty:
+                metapkg_rdepends.append(pkg)
     d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
     d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
 }
 
 # metapkg has runtime dependency on PN
-# each plugin depends on PN, plugin-dev on PN-dev and plugin-staticdev on \
PN-staticdev +# each plugin depends on PN, plugin-dev on PN-dev, plugin-staticdev on \
PN-staticdev  # so we need them even when empty (like in gst-plugins-good case)
 ALLOW_EMPTY_${PN} = "1"
 ALLOW_EMPTY_${PN}-dev = "1"
-- 
1.8.3


[prev in list] [next in list] [prev in thread] [next in thread]