From 913eb3376defe17e32a35114cc4bec478e24cf62 Mon Sep 17 00:00:00 2001 From: Mike Crowe Date: Wed, 2 May 2018 14:38:03 +0100 Subject: alsa-utils: Fix error when removing unwanted udev rules If alsa-utils configure is not passed a --with-udev-rules-dir option then it defaults to using /lib/udev/rules.d. This meant that the hard-coded use of ${D}/lib in do_install in 262e69c9c7acf0beb7bb6b96299e3c993c906434 worked correctly to remove the unwanted rules. Subsequently, 0a4372705a030ca54ed420cdfec33d46ab93499c changed do_install to use ${nonarch_base_libdir}, claiming to fix this in the usrmerge case. This means that if udev is not present in PACKAGECONFIG and usrmerge is present in DISTRO_FEATURES then the alsa-utils build system will install the rules in ${D}/lib/udev/rules.d but do_install will attempt to remove ${D}/usr/lib, resulting in something like: rmdir: failed to remove '.../tmp-glibc/work/i586-oe-linux/alsa-utils/1.1.5-r0/image/usr/lib': No such file or directory To fix this, let's just tell configure to install the rules in a specific known location when udev is disabled. This location can then easily be cleaned up in do_install without doing any harm if udev is enabled. Tested both with and without usrmerge in DISTRO_FEATURES and with and without udev in PACKAGECONFIG. (From OE-Core rev: 022b644e6ba2caa0b32ce3323621c07f78166234) Signed-off-by: Mike Crowe Cc: Phil Blundell Cc: Peter Kjellerstedt Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb index f2231f34f0..33215bf159 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb @@ -16,7 +16,7 @@ PACKAGECONFIG ??= "udev" # or no alsabat at all. PACKAGECONFIG[bat] = "--enable-bat,--disable-bat,fftwf" -PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev" +PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,--with-udev-rules-dir=/unwanted/rules.d,udev" PACKAGECONFIG[manpages] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ @@ -101,9 +101,8 @@ do_install() { rm ${D}${sbindir}/alsa-info.sh rm -f ${D}${sbindir}/alsabat-test.sh - 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}${nonarch_base_libdir}/udev - rmdir --ignore-fail-on-non-empty ${D}${nonarch_base_libdir} - fi + # If udev is disabled, we told configure to install the rules + # in /unwanted, so we can remove them now. If udev is enabled, + # then /unwanted won't exist and this will have no effect. + rm -rf ${D}/unwanted } -- cgit 1.2.3-korg