diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-09-01 19:49:29 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-21 16:55:57 +0100 |
commit | 88455dd53c0fb470ee0d5d29ce783e5c1e88ee6f (patch) | |
tree | 2573bc87c41c4c7720a0a42104eb85790abc3739 | |
parent | 625b0a67024a6e810e964c13e377008ee7f2675d (diff) | |
download | poky-88455dd53c0fb470ee0d5d29ce783e5c1e88ee6f.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)
(From OE-Core rev: d9f3c803d739a815fe5ee2e1227c5ae571fefb8f)
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>
(cherry picked from commit 8e9ceff887eb270be34f224811799f86e9dc91a8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils_1.1.3.bb | 4 |
1 files 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() { | |||
109 | 109 | ||
110 | if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then | 110 | if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then |
111 | # This is where alsa-utils will install its rules if we don't tell it anything else. | 111 | # This is where alsa-utils will install its rules if we don't tell it anything else. |
112 | rm -rf ${D}/lib/udev | 112 | rm -rf ${D}${nonarch_base_libdir}/udev |
113 | rmdir --ignore-fail-on-non-empty ${D}/lib | 113 | rmdir --ignore-fail-on-non-empty ${D}${nonarch_base_libdir} |
114 | fi | 114 | fi |
115 | } | 115 | } |