summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2014-01-20 05:30:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-28 00:52:32 +0000
commit492240ac22f3e3c534d9932404710e6f45e0ac9c (patch)
treed46f1c534c4bd7fa4f4010f156dd067a55db5527 /meta
parent66055fbeddeb5f5b1fe84c24085f30daa6cfe003 (diff)
downloadpoky-492240ac22f3e3c534d9932404710e6f45e0ac9c.tar.gz
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. (From OE-Core rev: 262e69c9c7acf0beb7bb6b96299e3c993c906434) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb11
1 files changed, 10 insertions, 1 deletions
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 831b9b8d1a..3384453218 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 \
7 file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" 7 file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9"
8DEPENDS = "alsa-lib ncurses libsamplerate0 udev" 8DEPENDS = "alsa-lib ncurses libsamplerate0 udev"
9 9
10PACKAGECONFIG ??= "udev"
11PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev"
12
10SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ 13SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
11 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ 14 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
12 " 15 "
@@ -18,7 +21,7 @@ SRC_URI[sha256sum] = "02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282ed
18# http://bugs.openembedded.org/show_bug.cgi?id=2348 21# http://bugs.openembedded.org/show_bug.cgi?id=2348
19# please close bug and remove this comment when properly fixed 22# please close bug and remove this comment when properly fixed
20# 23#
21EXTRA_OECONF = "--disable-xmlto --with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d " 24EXTRA_OECONF = "--disable-xmlto"
22EXTRA_OECONF_append_libc-uclibc = " --disable-nls" 25EXTRA_OECONF_append_libc-uclibc = " --disable-nls"
23 26
24inherit autotools gettext 27inherit autotools gettext
@@ -82,4 +85,10 @@ do_install() {
82 # We don't ship this here because it requires a dependency on bash. 85 # We don't ship this here because it requires a dependency on bash.
83 # See alsa-utils-alsaconf_${PV}.bb 86 # See alsa-utils-alsaconf_${PV}.bb
84 rm ${D}${sbindir}/alsaconf 87 rm ${D}${sbindir}/alsaconf
88
89 if ${@base_contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then
90 # This is where alsa-utils will install its rules if we don't tell it anything else.
91 rm -rf ${D}/lib/udev
92 rmdir --ignore-fail-on-non-empty ${D}/lib
93 fi
85} 94}