From: Peter Kjellerstedt Date: Fri, 1 Sep 2017 17:49:29 +0000 (+0200) Subject: alsa-utils: Do not hardcode path to /lib/udev X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~20114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4372705a030ca54ed420cdfec33d46ab93499c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton --- diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb index 54be50ed82d..c8f4b861bdc 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb @@ -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 }