diff options
-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 \ | |||
7 | file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" | 7 | file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" |
8 | DEPENDS = "alsa-lib ncurses libsamplerate0 udev" | 8 | DEPENDS = "alsa-lib ncurses libsamplerate0 udev" |
9 | 9 | ||
10 | PACKAGECONFIG ??= "udev" | ||
11 | PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev" | ||
12 | |||
10 | SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ | 13 | SRC_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 | # |
21 | EXTRA_OECONF = "--disable-xmlto --with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d " | 24 | EXTRA_OECONF = "--disable-xmlto" |
22 | EXTRA_OECONF_append_libc-uclibc = " --disable-nls" | 25 | EXTRA_OECONF_append_libc-uclibc = " --disable-nls" |
23 | 26 | ||
24 | inherit autotools gettext | 27 | inherit 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 | } |