[oe-commits] [openembedded-core] 04/17: alsa-utils: Do not hardcode path to /lib/udev

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch pyro
in repository openembedded-core.

commit d9f3c803d739a815fe5ee2e1227c5ae571fefb8f
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Fri Sep 1 19:49:29 2017 +0200

    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 at axis.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit 8e9ceff887eb270be34f224811799f86e9dc91a8)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 e6dd5b0..f374a17 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
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.