summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2016-08-05 16:27:16 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:31 +0100
commit1f00fa182b615cfa1862cb5dcb6b0d868a508d84 (patch)
treee6a596e364881a3b2fe927e44fb1570bd34ff58a /meta/recipes-multimedia/alsa
parent50c23e6c26a64b0c04e99abacb61ec00d1abace9 (diff)
downloadpoky-1f00fa182b615cfa1862cb5dcb6b0d868a508d84.tar.gz
alsa-utils: fix installed-vs-shipped for bat
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. (From OE-Core rev: 3a9551479678f97a83db22f213a54169ab4fc989) Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb4
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb7
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 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"
10 10
11FILES_${PN} = "${sbindir}/alsaconf \ 11FILES_${PN} = "${sbindir}/alsaconf \
12 ${sbindir}/alsa-info.sh \ 12 ${sbindir}/alsa-info.sh \
13 ${sbindir}/alsabat-test.sh \
13 " 14 "
14 15
15S = "${WORKDIR}/alsa-utils-${PV}" 16S = "${WORKDIR}/alsa-utils-${PV}"
@@ -18,4 +19,7 @@ do_install() {
18 install -d ${D}${sbindir} 19 install -d ${D}${sbindir}
19 install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/ 20 install -m 0755 ${B}/alsaconf/alsaconf ${D}${sbindir}/
20 install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/ 21 install -m 0755 ${S}/alsa-info/alsa-info.sh ${D}${sbindir}/
22 if ${@bb.utils.contains('PACKAGECONFIG', 'bat', 'true', 'false', d)}; then
23 install -m 0755 ${S}/bat/alsabat-test.sh ${D}${sbindir}/
24 fi
21} 25}
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() {
99 # See alsa-utils-scripts_${PV}.bb 99 # See alsa-utils-scripts_${PV}.bb
100 rm ${D}${sbindir}/alsaconf 100 rm ${D}${sbindir}/alsaconf
101 rm ${D}${sbindir}/alsa-info.sh 101 rm ${D}${sbindir}/alsa-info.sh
102 rm -f ${D}${sbindir}/alsabat-test.sh
102 103
103 if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then 104 if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then
104 # This is where alsa-utils will install its rules if we don't tell it anything else. 105 # This is where alsa-utils will install its rules if we don't tell it anything else.
105 rm -rf ${D}/lib/udev 106 rm -rf ${D}/lib/udev
106 rmdir --ignore-fail-on-non-empty ${D}/lib 107 rmdir --ignore-fail-on-non-empty ${D}/lib
107 fi 108 fi
108} 109}