Patchwork alsa-state: Rename init script

login
register
mail settings
Submitter Richard Purdie
Date Oct. 9, 2013, 10:41 p.m.
Message ID <1381358476.29912.49.camel@ted>
Download mbox | patch
Permalink /patch/59575/
State Accepted
Commit 5e3ed0b3a6d0f2ea484464e14028d0c9d3c3705d
Headers show

Comments

Richard Purdie - Oct. 9, 2013, 10:41 p.m.
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/alsa-state b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init
index 9850791..9850791 100755
--- a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
+++ b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init

Patch

diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb
index a9cc04c..552fcfc 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}