From 04c73333e4b539de96f096ca2954b2313175edc4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 7 Oct 2013 11:42:46 +0000 Subject: alsa-state: Rename init script Having a SRC_URI called ${PN} is asking for trouble. When extending FILESPATH, alsa-state can be treated as a directory and copied over the contents of ${WORKDIR} which is invariably not what the user wants. Avoid this by renaming the SRC_URI to something else and only call it alsa-state at install time. Signed-off-by: Richard Purdie --- meta/recipes-bsp/alsa-state/alsa-state.bb | 6 ++--- meta/recipes-bsp/alsa-state/alsa-state/alsa-state | 29 ---------------------- .../alsa-state/alsa-state/alsa-state-init | 29 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 32 deletions(-) delete mode 100755 meta/recipes-bsp/alsa-state/alsa-state/alsa-state create mode 100755 meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init (limited to 'meta/recipes-bsp/alsa-state') diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb index a9cc04c2a8..552fcfc022 100644 --- a/meta/recipes-bsp/alsa-state/alsa-state.bb +++ b/meta/recipes-bsp/alsa-state/alsa-state.bb @@ -15,7 +15,7 @@ PR = "r3" SRC_URI = "\ file://asound.conf \ file://asound.state \ - file://alsa-state \ + file://alsa-state-init \ " inherit update-rc.d @@ -24,9 +24,9 @@ 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 + 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 ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state install -d ${D}/${localstatedir}/lib/alsa install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} diff --git a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state deleted file mode 100755 index 9850791497..0000000000 --- a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2007 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) -# -# Filename: alsa-state -# Date: 20070308 (YMD) - - -asound_restore(){ - echo "ALSA: Restoring mixer settings..." - if test -x /usr/sbin/alsactl -a -e #STATEDIR#/asound.state - then - /usr/sbin/alsactl -f #STATEDIR#/asound.state restore & - fi -} - -asound_store(){ - echo "ALSA: Storing mixer settings..." - if test -x /usr/sbin/alsactl - then - /usr/sbin/alsactl -f #STATEDIR#/asound.state store - fi -} - -case "$1" in -start) asound_restore ;; -stop) asound_store ;; -esac diff --git a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init new file mode 100755 index 0000000000..9850791497 --- /dev/null +++ b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init @@ -0,0 +1,29 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2007 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: alsa-state +# Date: 20070308 (YMD) + + +asound_restore(){ + echo "ALSA: Restoring mixer settings..." + if test -x /usr/sbin/alsactl -a -e #STATEDIR#/asound.state + then + /usr/sbin/alsactl -f #STATEDIR#/asound.state restore & + fi +} + +asound_store(){ + echo "ALSA: Storing mixer settings..." + if test -x /usr/sbin/alsactl + then + /usr/sbin/alsactl -f #STATEDIR#/asound.state store + fi +} + +case "$1" in +start) asound_restore ;; +stop) asound_store ;; +esac -- cgit 1.2.3-korg