[OE-core] [PATCH] alsa-lib: fix possible missing RDEPENDS for alsa-utils package

Matthieu Crapet Matthieu.Crapet at ingenico.com
Tue Jan 27 16:07:37 UTC 2015


From: Matthieu Crapet <mcrapet at gmail.com>

alsa-lib (libasound.so) can be compiled with some disabled features (for example: midi)
See suggestion here: http://www.alsa-project.org/main/index.php/DevEmbedded

Depending configuration, alsa-utils recipe may not build all programs.
alsa-utils package will RDEPENDS of non existing packages (for example: alsa-utils-midi).

Minor recipe cleanup:
- Use ${BP}
- Fix do_install shell function with tabs only

Signed-off-by: Matthieu Crapet <mcrapet at gmail.com>
---
 meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
index ac5512a..279951d 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
@@ -11,7 +11,7 @@ PACKAGECONFIG ??= "udev"
 PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev"
 PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/${BP}.tar.bz2 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
            file://alsa-utils-aplay-interrupt-signal-handling.patch \
           "
@@ -64,7 +64,6 @@ FILES_alsa-utils-aseqdump    = "${bindir}/aseqdump"
 FILES_alsa-utils-alsaloop    = "${bindir}/alsaloop"
 FILES_alsa-utils-alsaucm     = "${bindir}/alsaucm"
 
-
 SUMMARY_alsa-utils-aplay        = "Play (and record) sound files using ALSA"
 SUMMARY_alsa-utils-amixer       = "Command-line control for ALSA mixer and settings"
 SUMMARY_alsa-utils-alsamixer    = "ncurses-based control for ALSA mixer and settings"
@@ -90,8 +89,17 @@ do_install() {
 	rm ${D}${sbindir}/alsaconf
 
 	if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then
-	   # This is where alsa-utils will install its rules if we don't tell it anything else.
-	   rm -rf ${D}/lib/udev
-	   rmdir --ignore-fail-on-non-empty ${D}/lib
+		# This is where alsa-utils will install its rules if we don't tell it anything else.
+		rm -rf ${D}/lib/udev
+		rmdir --ignore-fail-on-non-empty ${D}/lib
 	fi
 }
+
+python populate_packages_prepend () {
+    packages = d.getVar('ALSA_UTILS_PKGS', True)
+    pkgd = d.getVar('PKGD', True)
+    for pkg in packages.split():
+        pkgfiles = d.getVar('FILES_' + pkg, True).split()
+        if not os.path.exists(pkgd + pkgfiles[0]):
+            d.setVar('ALLOW_EMPTY_' + pkg, "1")
+}
-- 
1.9.1




More information about the Openembedded-core mailing list