[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (3 files)

[Steve Kowalik]

    Date: Thursday, April 15, 2004 @ 07:20:54
  Author: stevenk
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.init alsa-base.postinst changelog

Actually do some work on this package! This would have to be my first commit in absolutely far too long. These changes need to be tested first, on my udev laptop, and my non-devfs non-udev workstation first, but I will commit again providing the blacklist and probably fixing or okaying the new init script.

Changes from the changelog:
    - Check for the presence of either devfs or udev before creating device 
      nodes. (Closes: #243876)
    - Add the "patch" to also load OSS modules when udev is being used.
      (Closes: #240594) (thanks, Markus Hubig)
    - Apply patch to the init.d script to not contain duplicated code, and to
      wait one second after loading the modules. (Closes: #237003, #237452)
      (thanks, Martin Schwenke)
    - Provide /etc/hotplug/blacklist.d/alsa-base, which lists every OSS 
      sound module, current as of 2.6.5. (Closes: #238694) (Not Done)


--------------------+
 alsa-base.init     |   13 +++++--------
 alsa-base.postinst |    2 +-
 changelog          |   15 +++++++++++++--
 3 files changed, 19 insertions(+), 11 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.init
diff -u debian/alsa-driver/debian/alsa-base.init:1.41 debian/alsa-driver/debian/alsa-base.init:1.42
--- debian/alsa-driver/debian/alsa-base.init:1.41	Thu Feb 26 17:17:53 2004
+++ debian/alsa-driver/debian/alsa-base.init	Thu Apr 15 07:20:53 2004
@@ -28,7 +28,7 @@
 esac
 
 # Auto detect starting OSS layer
-if [ ! -f /proc/sys/kernel/modprobe -o -c /dev/.devfsd ]; then
+if [ ! -f /proc/sys/kernel/modprobe -o -c /dev/.devfsd -o -f /dev/.udev.tdb ]; then
 	startosslayer="true"
 else
 	startosslayer="false"
@@ -51,15 +51,12 @@
 
 case "$1" in
     start)
+	if [ ! -f /proc/asound/version ] ; then
+	    modprobe snd > /dev/null 2>&1
+	    sleep 1  # Temporary hack so that this works with udev.
+	fi
 	if [ -f /proc/asound/version ]; then
 	    alsa_version="$(head -1 /proc/asound/version | cut -f7 -d" " | sed 's/\(.*\)\.$/\1/')"
-	elif modprobe snd > /dev/null 2>&1; then
-	    if [ -f /proc/asound/version ]; then
-		alsa_version="$(head -1 /proc/asound/version | cut -f7 -d" " | sed 's/\(.*\)\.$/\1/')"
-	    else
-		echo "Starting ALSA (unknown version): failed - internal error 1"
-		exit 1
-	    fi
 	else
 	    echo "Starting ALSA (unknown version): failed - ALSA modules not installed"
 	    exit 1
Index: debian/alsa-driver/debian/alsa-base.postinst
diff -u debian/alsa-driver/debian/alsa-base.postinst:1.33 debian/alsa-driver/debian/alsa-base.postinst:1.34
--- debian/alsa-driver/debian/alsa-base.postinst:1.33	Tue Mar  2 10:01:47 2004
+++ debian/alsa-driver/debian/alsa-base.postinst	Thu Apr 15 07:20:54 2004
@@ -78,7 +78,7 @@
 			/usr/sbin/update-devfsd >&2
 		fi
 		if [ ! -c /dev/audio -a ! -c /dev/dsp -a ! -c /dev/amixer ] || [ -h /dev/snd -o ! -d /dev/snd ]; then
-			if [ ! -e /dev/.devfsd ]; then
+			if [ ! -e /dev/.devfsd -a ! -e /dev/.udev.tdb ]; then
 				/usr/share/alsa-base/snddevices > /dev/null
 			fi
 		fi
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.233 debian/alsa-driver/debian/changelog:1.234
--- debian/alsa-driver/debian/changelog:1.233	Tue Apr 13 17:23:54 2004
+++ debian/alsa-driver/debian/changelog	Thu Apr 15 07:20:54 2004
@@ -1,9 +1,20 @@
 alsa-driver (1.0.4-2) unstable; urgency=low
 
-  * Unreleased.
   * Suppossedly, this release fixes hotplug.
+  * Steve Kowalik:
+    - Actually do some work on this package!
+    - Check for the presence of either devfs or udev before creating device 
+      nodes. (Closes: #243876)
+    - Add the "patch" to also load OSS modules when udev is being used.
+      (Closes: #240594) (thanks, Markus Hubig)
+    - Apply patch to the init.d script to not contain duplicated code, and to
+      wait one second after loading the modules. (Closes: #237003, #237452)
+      (thanks, Martin Schwenke)
+    - Provide /etc/hotplug/blacklist.d/alsa-base, which lists every OSS 
+      sound module, current as of 2.6.5. (Closes: #238694) (Not Done)
+  * Unreleased.
 
- -- Jordi Mallach <jordi@debian.org>  Wed, 14 Apr 2004 01:23:00 +0200
+ -- Steve Kowalik <stevenk@debian.org>  Thu, 15 Apr 2004 22:44:04 +1000
 
 alsa-driver (1.0.4-1) unstable; urgency=low