summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-09-01 19:49:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 17:30:28 +0100
commit8e9ceff887eb270be34f224811799f86e9dc91a8 (patch)
treeef8751eda3ac721c63b63f829f4e3a204d6517ff /meta/recipes-multimedia
parent7470b7ef19233793a418b6a2f5dc3eb396fca4f4 (diff)
downloadpoky-8e9ceff887eb270be34f224811799f86e9dc91a8.tar.gz
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>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb4
1 files changed, 2 insertions, 2 deletions
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() {
103 103
104 if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then 104 if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then
105 # This is where alsa-utils will install its rules if we don't tell it anything else. 105 # This is where alsa-utils will install its rules if we don't tell it anything else.
106 rm -rf ${D}/lib/udev 106 rm -rf ${D}${nonarch_base_libdir}/udev
107 rmdir --ignore-fail-on-non-empty ${D}/lib 107 rmdir --ignore-fail-on-non-empty ${D}${nonarch_base_libdir}
108 fi 108 fi
109} 109}