diff options
| author |   Phil Blundell <pb@pbcl.net> | 2014-01-20 05:30:49 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:48:24 +0000 |
| commit | 262e69c9c7acf0beb7bb6b96299e3c993c906434 (patch) | |
| tree | 5afd6b226fa90d1c9e69fae18ddd3db4a7d5105c /meta/recipes-multimedia | |
| parent | 773d7352309241e15ef5acadcbe416bdd7d45c18 (diff) | |
| download | openembedded-core-contrib-262e69c9c7acf0beb7bb6b96299e3c993c906434.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.
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb | 11 |
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 \ 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 } |