From 3a9551479678f97a83db22f213a54169ab4fc989 Mon Sep 17 00:00:00 2001 From: Stefan Müller-Klieser Date: Fri, 5 Aug 2016 16:27:16 +0200 Subject: alsa-utils: fix installed-vs-shipped for bat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bat PACKAGECONFIG does not install the test script correctly. Fix this by following the packaging used for the other bash scripts. While at it, fix some tabs. Signed-off-by: Stefan Müller-Klieser Signed-off-by: Ross Burton --- meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb | 4 ++++ meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'meta/recipes-multimedia/alsa') diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb index a98f9b90ba..fef79d9c9c 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb @@ -10,6 +10,7 @@ RDEPENDS_${PN} += "bash" FILES_${PN} = "${sbindir}/alsaconf \ ${sbindir}/alsa-info.sh \ + ${sbindir}/alsabat-test.sh \ " S = "${WORKDIR}/alsa-utils-${PV}" @@ -18,4 +19,7 @@ do_install() { install -d ${D}${sbindir} install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/ install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/ + if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'true', 'false', d)}; then + install -m 0755 ${S}/bat/alsabat-test.sh ${D}${sbindir}/ + fi } diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb index 08c4646e34..ddb1644bcf 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb @@ -99,10 +99,11 @@ do_install() { # See alsa-utils-scripts_${PV}.bb rm ${D}${sbindir}/alsaconf 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}/lib/udev - rmdir --ignore-fail-on-non-empty ${D}/lib + # 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 fi } -- cgit 1.2.3-korg