mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

alsa-state: move state files to localstatedir

Browse Source 
alsactl creates the state files in /var/lib/alsa by default so switch
alsa-state to use files in that location.

Further, update the alsa-state init script to have the location of the
state files sed'ed into the script at do_install time (so as to remove
hard coding of directory paths).

(From OE-Core rev: 896924c72e7b37c18819229e8160c34cdf4465c8)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Lock
2012-01-10 08:32:08 -08:00
committed by Richard Purdie
parent c86797abdf
commit 432c6cff0f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-bsp/alsa-state/alsa-state.bb
+5 -3
View File
@@ -26,11 +26,13 @@ INITSCRIPT_NAME = "alsa-state"
INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ."
do_install() { do_install() {
sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${WORKDIR}/alsa-state
install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
install -d ${D}/${localstatedir}/lib/alsa
install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir} install -m 0644 ${WORKDIR}/*.state ${D}${localstatedir}/lib/alsa
} }
PACKAGES += "alsa-states" PACKAGES += "alsa-states"
@@ -40,14 +42,14 @@ RRECOMMENDS_alsa-state = "alsa-states"
FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf"
CONFFILES_${PN} = "${sysconfdir}/asound.conf" CONFFILES_${PN} = "${sysconfdir}/asound.conf"
FILES_alsa-states = "${sysconfdir}/*.state" FILES_alsa-states = "${localstatedir}/lib/alsa/*.state"
pkg_postinst_${PN}() { pkg_postinst_${PN}() {
if test -z "$D" if test -z "$D"
then then
if test -x /usr/sbin/alsactl if test -x /usr/sbin/alsactl
then then
/usr/sbin/alsactl -f ${sysconfdir}/asound.state restore /usr/sbin/alsactl -f ${localstatedir}/lib/alsa/asound.state restore
fi fi
# INITSCRIPT_PARAMS changed, so remove the old and # INITSCRIPT_PARAMS changed, so remove the old and
# install the new setting. # install the new setting.
meta/recipes-bsp/alsa-state/alsa-state/alsa-state
+3 -3
View File
@@ -9,9 +9,9 @@
asound_restore(){ asound_restore(){
echo "ALSA: Restoring mixer settings..." echo "ALSA: Restoring mixer settings..."
if test -x /usr/sbin/alsactl -a -e /etc/asound.state if test -x /usr/sbin/alsactl -a -e #STATEDIR#/asound.state
then then
/usr/sbin/alsactl -f /etc/asound.state restore & /usr/sbin/alsactl -f #STATEDIR#/asound.state restore &
fi fi
} }
@@ -19,7 +19,7 @@ asound_store(){
echo "ALSA: Storing mixer settings..." echo "ALSA: Storing mixer settings..."
if test -x /usr/sbin/alsactl if test -x /usr/sbin/alsactl
then then
/usr/sbin/alsactl -f /etc/asound.state store /usr/sbin/alsactl -f #STATEDIR#/asound.state store
fi fi
} }