From 0a4372705a030ca54ed420cdfec33d46ab93499c Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 1 Sep 2017 19:49:29 +0200 Subject: 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 --- meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-multimedia/alsa') 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 54be50ed82..c8f4b861bd 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 } -- cgit 1.2.3-korg