diff options
| author |   Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-27 10:12:58 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-27 10:12:58 +0000 |
| commit | 3f298b0d3342d1fbbbc1830528698fb4dd640d34 (patch) | |
| tree | e3ed4b4b06030722ff2f0628e5af27aa7695d736 /packages/alsa | |
| parent | df756c10617bb375929b672e9d6a26952dbb31b9 (diff) | |
| download | openembedded-3f298b0d3342d1fbbbc1830528698fb4dd640d34.tar.gz | |
Revert "Merge commit 'origin/john_lee/fastboot-devel' into org.openembedded.dev"
This reverts commit 366bf6043abfbbbfa98168548f42aa9aaf6c28b9.
This did broke all image for !om-gta02. Reverted and PRs bumped.
Diffstat (limited to 'packages/alsa')
| -rw-r--r-- | packages/alsa/alsa-state.bb | 8 | ||||
| -rwxr-xr-x | packages/alsa/alsa-state/alsa-state | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 9e7f157059..ba030e4aab 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Alsa Scenario Files" LICENSE = "MIT" PV = "0.2.0" -PR = "r1" +PR = "r0" SRC_URI = "\ file://asound.conf \ @@ -19,7 +19,7 @@ SRC_URI = "\ inherit update-rc.d INITSCRIPT_NAME = "alsa-state" -INITSCRIPT_PARAMS = "start 39 S ." +INITSCRIPT_PARAMS = "defaults 10" do_install() { install -d ${D}${sysconfdir}/init.d @@ -50,9 +50,5 @@ pkg_postinst_${PN}() { then /usr/sbin/alsactl -f ${sysconfdir}/asound.state restore fi - # INITSCRIPT_PARAMS changed, so remove the old and - # install the new setting. - update-rc.d -f ${INITSCRIPT_NAME} remove - update-rc.d ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} fi } diff --git a/packages/alsa/alsa-state/alsa-state b/packages/alsa/alsa-state/alsa-state index 84cdf03750..c6bc1fd494 100755 --- a/packages/alsa/alsa-state/alsa-state +++ b/packages/alsa/alsa-state/alsa-state @@ -11,7 +11,7 @@ asound_restore(){ echo "ALSA: Restoring mixer settings..." if test -x /usr/sbin/alsactl -a -e /etc/asound.state then - /usr/sbin/alsactl -f /etc/asound.state restore & + /usr/sbin/alsactl -f /etc/asound.state restore fi } |