[PATCH] alsa-utils: fix installed-vs-shipped for bat

[PATCH] alsa-utils: fix installed-vs-shipped for bat

[Stefan Müller-Klieser]

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 <s.mueller-klieser@phytec.de>
---
 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(-)

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 a98f9b9..4e28fef 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', 'false', 'true', 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 08c4646..ab07fa8 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 ${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
 }
-- 
1.9.1

Re: [PATCH] alsa-utils: fix installed-vs-shipped for bat

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

On 5 August 2016 at 14:15, Stefan Müller-Klieser <
s.mueller-klieser@phytec.de> wrote:

> +       if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'false', 'true',
> d)}; then
>

This means the script is installed if bat isn't selected, which I don't
think you meant.

Ross

[-- Attachment #2: Type: text/html, Size: 742 bytes --]

Re: [PATCH] alsa-utils: fix installed-vs-shipped for bat

[Stefan Müller-Klieser]

On 05.08.2016 15:19, Burton, Ross wrote:
> On 5 August 2016 at 14:15, Stefan Müller-Klieser <
> s.mueller-klieser@phytec.de> wrote:
> 
>> +       if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'false', 'true',
>> d)}; then
>>
> 
> This means the script is installed if bat isn't selected, which I don't
> think you meant.

It seems I tricked myself when testing. I will send a v2.
Stefan

> 
> Ross
>