Finalise deplacement alsa vers stage3

diff --git a/stage3/bootscripts/alsa b/stage3/bootscripts/alsa
new file mode 100755 (executable)
index 0000000..c0de296
--- /dev/null
+++ b/stage3/bootscripts/alsa
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# alsa
+
+# Source functions library
+source /etc/rc.d/init.d/functions
+
+log_script_name "$0 $*"
+
+alsactl=/usr/sbin/alsactl
+
+# See how we were called.
+case "$1" in
+    start)
+       cmd_run_log_box "Loading sound settings" ${alsactl} restore
+       ;;
+
+    stop)
+       cmd_run_log_box "Saving sound settings" ${alsactl} store
+       ;;
+    
+    *)
+        echo "Usage: $0 {start|stop}"
+        exit ${EXIT_CODE_FAILURE}
+        ;;
+    
+esac
+
+exit 0

diff --git a/stage3/pkg/alsa-lib b/stage3/pkg/alsa-lib
new file mode 100644 (file)
index 0000000..87332ba
--- /dev/null
+++ b/stage3/pkg/alsa-lib
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+hvconfig_pre()
+{
+    CONFIGURE_OPTS=" \
+        --enable-static"
+}

diff --git a/stage3/pkg/alsa-utils b/stage3/pkg/alsa-utils
new file mode 100644 (file)
index 0000000..8d3bf8a
--- /dev/null
+++ b/stage3/pkg/alsa-utils
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+hvconfig_pre()
+{
+    CONFIGURE_OPTS=""
+}
+
+hvbuild_post()
+{
+    # The first time the alsa bootscript is run, it will complain that there is
+    # no state in /etc/asound.state. You can prevent this by running the
+    # following commands after installing alsa-utils:
+    touch /etc/asound.state
+
+    install -v -m740 ${SCRDIR}/bootscripts/alsa /etc/rc.d/init.d
+
+    # script-name start stop
+    bootscript_add_rcsysinit alsa 95 85
+}

diff --git a/stage5/bootscripts/alsa b/stage5/bootscripts/alsa
deleted file mode 100755 (executable)
index c0de296..0000000
--- a/stage5/bootscripts/alsa
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# alsa
-
-# Source functions library
-source /etc/rc.d/init.d/functions
-
-log_script_name "$0 $*"
-
-alsactl=/usr/sbin/alsactl
-
-# See how we were called.
-case "$1" in
-    start)
-       cmd_run_log_box "Loading sound settings" ${alsactl} restore
-       ;;
-
-    stop)
-       cmd_run_log_box "Saving sound settings" ${alsactl} store
-       ;;
-    
-    *)
-        echo "Usage: $0 {start|stop}"
-        exit ${EXIT_CODE_FAILURE}
-        ;;
-    
-esac
-
-exit 0

diff --git a/stage5/pkg/alsa-lib b/stage5/pkg/alsa-lib
deleted file mode 100644 (file)
index 029138b..0000000
--- a/stage5/pkg/alsa-lib
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    CONFIGURE_OPTS=" \
-        --enable-static"
-}
-
-hvbuild_post()
-{
-    install -v -m644 -D doc/asoundrc.txt /usr/share/doc/${PACKAGE}/asoundrc.txt
-}

diff --git a/stage5/pkg/alsa-utils b/stage5/pkg/alsa-utils
deleted file mode 100644 (file)
index 8d3bf8a..0000000
--- a/stage5/pkg/alsa-utils
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-hvconfig_pre()
-{
-    CONFIGURE_OPTS=""
-}
-
-hvbuild_post()
-{
-    # The first time the alsa bootscript is run, it will complain that there is
-    # no state in /etc/asound.state. You can prevent this by running the
-    # following commands after installing alsa-utils:
-    touch /etc/asound.state
-
-    install -v -m740 ${SCRDIR}/bootscripts/alsa /etc/rc.d/init.d
-
-    # script-name start stop
-    bootscript_add_rcsysinit alsa 95 85
-}