[OE-core] [PATCH v2] alsa-utils: fix installed-vs-shipped for bat
Stefan Müller-Klieser
s.mueller-klieser at phytec.de
Fri Aug 5 14:27:16 UTC 2016
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 at phytec.de>
---
v2:
- fix mixed up install logic
- retested all PACKAGECONFIG for utils and utils-scripts w/wo bat
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..fef79d9 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 08c4646..ddb1644 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
}
--
1.9.1
More information about the Openembedded-core
mailing list