[oe-commits] Phil Blundell : alsa-utils: Add PACKAGECONFIG for udev

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 5f0497170c6b3b9ff4b0b6b2b5cb4a0d3a07e6b9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5f0497170c6b3b9ff4b0b6b2b5cb4a0d3a07e6b9

Author: Phil Blundell <pb at pbcl.net>
Date:   Mon Jan 20 05:30:49 2014 +0000

alsa-utils: Add PACKAGECONFIG for udev

Commit b92a3e9d093bc9421aa38a40bc6bfd559a16b3be introduced a dependency
on udev, which is undesirable for distros which don't otherwise require
or build udev (and, as such, don't have any interest in the rules.d files).

Make this conditional on a PACKAGECONFIG setting so that it can be turned
off.  If it's off, we don't depend on udev and don't ship the rules.

Signed-off-by: Phil Blundell <pb at pbcl.net>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
index 831b9b8..3384453 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
@@ -7,6 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
 DEPENDS = "alsa-lib ncurses libsamplerate0 udev"
 
+PACKAGECONFIG ??= "udev"
+PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev"
+
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
           "
@@ -18,7 +21,7 @@ SRC_URI[sha256sum] = "02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282ed
 # http://bugs.openembedded.org/show_bug.cgi?id=2348
 # please close bug and remove this comment when properly fixed
 #
-EXTRA_OECONF = "--disable-xmlto --with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d "
+EXTRA_OECONF = "--disable-xmlto"
 EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
 
 inherit autotools gettext
@@ -82,4 +85,10 @@ do_install() {
 	# We don't ship this here because it requires a dependency on bash.
 	# See alsa-utils-alsaconf_${PV}.bb
 	rm ${D}${sbindir}/alsaconf
+
+	if ${@base_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
+	fi
 }