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 <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb
index a9cc04c2a83c28cd98e36f3d1a035dcc86fa8901..552fcfc02222ce13b3d4d29b4250578dbf0deed9 100644 (file)
--- 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-init
similarity index 100%
rename from meta/recipes-bsp/alsa-state/alsa-state/alsa-state
rename to meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init