[arch-commits] CVS update of arch/build/base/hwdetect (PKGBUILD hwdetect)

[Tobias Powalowski]

    Date: Sunday, May 6, 2007 @ 15:36:42
  Author: tpowa
    Path: /home/cvs-arch/arch/build/base/hwdetect

Modified: PKGBUILD (1.5 -> 1.6) hwdetect (1.5 -> 1.6)

'upgpkg: added --sound parameter'


----------+
 PKGBUILD |    6 +++---
 hwdetect |   20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)


Index: arch/build/base/hwdetect/PKGBUILD
diff -u arch/build/base/hwdetect/PKGBUILD:1.5 arch/build/base/hwdetect/PKGBUILD:1.6
--- arch/build/base/hwdetect/PKGBUILD:1.5	Mon Mar 26 14:53:26 2007
+++ arch/build/base/hwdetect/PKGBUILD	Sun May  6 15:36:41 2007
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.5 2007/03/26 18:53:26 tpowa Exp $
+# $Id: PKGBUILD,v 1.6 2007/05/06 19:36:41 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
 pkgver=0.8
-pkgrel=6
+pkgrel=7
 pkgdesc="Hardware detection script, loading modules and mkinitcpio.conf / rc.conf support included"
 arch=(i686 x86_64)
 backup=()
 depends=('bash' 'awk' 'grep' 'coreutils' 'sed')
 source=(hwdetect)
-md5sums=('f7f662baf55b78f7163a0e6864df8ac8')
+md5sums=('b1c25aa141e33149b753c2df96649733')
 
 build() {
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
Index: arch/build/base/hwdetect/hwdetect
diff -u arch/build/base/hwdetect/hwdetect:1.5 arch/build/base/hwdetect/hwdetect:1.6
--- arch/build/base/hwdetect/hwdetect:1.5	Mon Mar 26 14:53:26 2007
+++ arch/build/base/hwdetect/hwdetect	Sun May  6 15:36:42 2007
@@ -47,6 +47,7 @@
 	echo ""
 	echo "  For /etc/rc.conf use:"
 	echo "    --net                  show network MODULES"
+	echo "    --sound                show sound MODULES"
 	echo "    --modules              show all detected MODULES"
 	echo ""
 	exit 1
@@ -150,7 +151,10 @@
 		modprobe -i --set-version=$KERNEL_VERSION --show-depends pnp:d${devid} >> /tmp/modules-plain 2>/dev/null
 	
 		[ "$devid" == "PNP0800" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends pcspkr >> /tmp/modules-plain 2>/dev/null
-		[ "$devid" == "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc >> /tmp/modules-plain 2>/dev/null
+		#[ "$devid" == "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc >> /tmp/modules-plain 2>/dev/null
+		[ "$devid" == "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc_proc >> /tmp/modules-plain 2>/dev/null
+		[ "$devid" == "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc_sysfs >> /tmp/modules-plain
+		[ "$devid" == "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc_dev >> /tmp/modules-plain
 		[ "$devid" == "PNP0510" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends irtty-sir >> /tmp/modules-plain 2>/dev/null
 		[ "$devid" == "PNP0511" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends irtty-sir >> /tmp/modules-plain 2>/dev/null
 		[ "$devid" == "PNPb02f" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends analog >> /tmp/modules-plain 2>/dev/null
@@ -380,15 +384,21 @@
 				;;
                 --net)  if [ "$(showlist2 "MODULES"  \(`listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/`\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' | grep '8139cp')" ] ; then
   				if [ "$(dmesg | grep '"8139too"')" ]; then
-					 showlist2 "MODULES"  \(`listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/`\) | sed -e 's/8139cp//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+						MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/)"
+					 showlist2 "MODULES"  \($MODULES_EXPORTED\) | sed -e 's/8139cp//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 				else
-					showlist2 "MODULES"  \(`listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/`\) | sed -e 's/8139too//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+					MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/)"
+					showlist2 "MODULES"  \($MODULES_EXPORTED\) | sed -e 's/8139too//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 				fi
 			else
-				showlist2 "MODULES"  \(`listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/`\) | sed -e 's/(\  /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+				MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc` `listmods drivers/usb/net/)"
+				showlist2 "MODULES"  \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 			fi
 			;;
-		--modules) showlist2 "MODULES" \(`listmods modules/`\) | sed -e 's/(\  /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+		--sound) MODULES_EXPORTED="$MODULES_EXPORTED $(listmods sound/)"
+			showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+			 ;;
+		--modules) showlist2 "MODULES" \(`listmods modules/`\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 			 ;;
 		--hooks) 
 			if [ "$HOOKS_DIR" = "" ]; then