summaryrefslogtreecommitdiffstats
path: root/meta
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-11 23:18:15 +0100
commit04c73333e4b539de96f096ca2954b2313175edc4 (patch)
treef738c1de5aa43bc1ea7d5e5d7c8fb8c61482a8ba /meta
parent9f6c4edf40963d1f3fb9f7e2d2b7a866aa1afe57 (diff)
downloadopenembedded-core-04c73333e4b539de96f096ca2954b2313175edc4.tar.gz
openembedded-core-04c73333e4b539de96f096ca2954b2313175edc4.tar.bz2
openembedded-core-04c73333e4b539de96f096ca2954b2313175edc4.zip
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>
Diffstat (limited to 'meta')
-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"
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
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