From 5e3ed0b3a6d0f2ea484464e14028d0c9d3c3705d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 7 Oct 2013 11:42:46 +0000 Subject: [PATCH] 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 --- meta/recipes-bsp/alsa-state/alsa-state.bb | 6 +++--- .../alsa-state/alsa-state/{alsa-state => alsa-state-init} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-bsp/alsa-state/alsa-state/{alsa-state => alsa-state-init} (100%) 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 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