mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

alsa-utils: fix installed-vs-shipped for bat

Browse Source 
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>
This commit is contained in:
Stefan Müller-Klieser
2016-08-05 16:27:16 +02:00
committed by Richard Purdie
parent 50c23e6c26
commit 1f00fa182b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.1.bb
+4
View File
@@ -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
}
meta/recipes-multimedia/alsa/alsa-utils_1.1.1.bb
+4 -3
View File
@@ -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
}