alsa-utils: Do not hardcode path to /lib/udev

Use ${nonarch_base_libdir}/udev instead. This avoids problems when
usrmerge is enabled in DISTRO_FEATURES and udev support is disabled.

(From OE-Core rev: 0a4372705a030ca54ed420cdfec33d46ab93499c)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8e9ceff887eb270be34f224811799f86e9dc91a8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.3.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.3.bb
index e6dd5b0a8704296d339d2f4a2082baeb829e0aba..f374a17411e019fb34f8a63606efe8f626cbe062 100644 (file)
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.3.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.3.bb
@@ -109,7 +109,7 @@ do_install() {
 
        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
+               rm -rf ${D}${nonarch_base_libdir}/udev
+               rmdir --ignore-fail-on-non-empty ${D}${nonarch_base_libdir}
        fi
 }