summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-07 11:42:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:22 +0100
commit5e3ed0b3a6d0f2ea484464e14028d0c9d3c3705d (patch)
tree932e7f15d9129019031ecf4abd3cd8966ce53bba /meta/recipes-bsp
parent1960f0068410ca62b27887f5f2607a80dba596b9 (diff)
downloadpoky-5e3ed0b3a6d0f2ea484464e14028d0c9d3c3705d.tar.gz
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. (From OE-Core rev: 04c73333e4b539de96f096ca2954b2313175edc4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/alsa-state/alsa-state.bb6
-rwxr-xr-xmeta/recipes-bsp/alsa-state/alsa-state/alsa-state-init (renamed from meta/recipes-bsp/alsa-state/alsa-state/alsa-state)0
2 files changed, 3 insertions, 3 deletions
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"
15SRC_URI = "\ 15SRC_URI = "\
16 file://asound.conf \ 16 file://asound.conf \
17 file://asound.state \ 17 file://asound.state \
18 file://alsa-state \ 18 file://alsa-state-init \
19" 19"
20 20
21inherit update-rc.d 21inherit update-rc.d
@@ -24,9 +24,9 @@ INITSCRIPT_NAME = "alsa-state"
24INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." 24INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ."
25 25
26do_install() { 26do_install() {
27 sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${WORKDIR}/alsa-state 27 sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${WORKDIR}/alsa-state-init
28 install -d ${D}${sysconfdir}/init.d 28 install -d ${D}${sysconfdir}/init.d
29 install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d 29 install -m 0755 ${WORKDIR}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state
30 30
31 install -d ${D}/${localstatedir}/lib/alsa 31 install -d ${D}/${localstatedir}/lib/alsa
32 install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} 32 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
index 9850791497..9850791497 100755
--- a/meta/recipes-bsp/alsa-state/alsa-state/alsa-state
+++ b/meta/recipes-bsp/alsa-state/alsa-state/alsa-state-init