aboutsummaryrefslogtreecommitdiffstats
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:09 +0100
commit0a4372705a030ca54ed420cdfec33d46ab93499c (patch)
tree7a071fda9ddce41c7229942b3e00ad42cd01ced6 /meta/recipes-multimedia
parentcdb431676456f47da1a3b70caddf49f083948798 (diff)
downloadopenembedded-core-contrib-0a4372705a030ca54ed420cdfec33d46ab93499c.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. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
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() {
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
}