[OE-core] [PATCH 1/1] alsa-state: do not install the init script in case of systemd
Chen Qi
Qi.Chen at windriver.com
Thu Feb 13 07:32:45 UTC 2014
As the corresponding service files have already been provided by
the alsa-utils-alsactl package, the init script is really not needed.
So we do not install it in a systemd based image.
[YOCTO #4420]
Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
meta/recipes-bsp/alsa-state/alsa-state.bb | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb
index 552fcfc..6dbc1aa 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -18,16 +18,20 @@ SRC_URI = "\
file://alsa-state-init \
"
-inherit update-rc.d
+inherit update-rc.d systemd
INITSCRIPT_NAME = "alsa-state"
INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ."
do_install() {
- sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${WORKDIR}/alsa-state-init
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state
-
+ # The alsa-utils-alsactl already provides corresponding systemd unit files.
+ # So the init script should not be installed in a systemd based image.
+ install -d ${D}${sysconfdir}
+ if ${@base_contains('DISTRO_FEATURES','systemd','false','true',d)}; then
+ sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${WORKDIR}/alsa-state-init
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state
+ fi
install -d ${D}/${localstatedir}/lib/alsa
install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/*.state ${D}${localstatedir}/lib/alsa
--
1.7.9.5
More information about the Openembedded-core
mailing list