From 88455dd53c0fb470ee0d5d29ce783e5c1e88ee6f Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 1 Sep 2017 19:49:29 +0200 Subject: [PATCH] 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) (From OE-Core rev: d9f3c803d739a815fe5ee2e1227c5ae571fefb8f) Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 8e9ceff887eb270be34f224811799f86e9dc91a8) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-multimedia/alsa/alsa-utils_1.1.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e6dd5b0a87..f374a17411 100644 --- 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 }