]> code.ossystems Code Review - openembedded-core.git/commitdiff
alsa-utils: Do not hardcode path to /lib/udev
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Fri, 1 Sep 2017 17:49:29 +0000 (19:49 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Sep 2017 16:30:09 +0000 (17:30 +0100)
Use ${nonarch_base_libdir}/udev instead. This avoids problems when
usrmerge is enabled in DISTRO_FEATURES and udev support is disabled.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb

index 54be50ed82d90781ecb092c41e3de8ce3aa4e92f..c8f4b861bdc19b385da6f2b33f29a5c623df15f1 100644 (file)
@@ -103,7 +103,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
 }