[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

[Tobias Powalowski]

    Date: Wednesday, December 17, 2008 @ 11:36:15
  Author: tpowa
Revision: 21896

upgpkg: hwdetect 2008.12-1

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

----------+
 PKGBUILD |    7 ++++---
 hwdetect |   23 +++++++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-17 15:32:11 UTC (rev 21895)
+++ PKGBUILD	2008-12-17 16:36:15 UTC (rev 21896)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
-pkgver=0.9.1
-pkgrel=2
+pkgver=2008.12
+pkgrel=1
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(i686 x86_64)
 license=('custom:none')
@@ -14,4 +14,5 @@
 build() {
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
 }
-md5sums=('4cdbfcef9075e9ce78a3225124d9d348')
+
+md5sums=('8954900f42fe9f1cfaf5a8d92ffcc092')

Modified: hwdetect
===================================================================
--- hwdetect	2008-12-17 15:32:11 UTC (rev 21895)
+++ hwdetect	2008-12-17 16:36:15 UTC (rev 21896)
@@ -51,6 +51,7 @@
 	echo "  For /etc/rc.conf use:"
 	echo "    --net                  show network MODULES"
 	echo "    --sound                show sound MODULES"
+	echo "    --usbhost              show usb hostcontroller MODULES"
 	echo "    --modules              show all detected MODULES"
 	echo ""
 	exit 1
@@ -83,6 +84,9 @@
 	[ "$(echo $* | grep '\-raid')" ] && RAID=1
 fi
 
+# dmraid switch
+[ "$(echo $* | grep '\-dmraid')" ] && DMRAID=1
+
 # encrypt switch
 [ "$(echo $* | grep '\-encrypt')" ] && ENCRYPT=1
 
@@ -230,10 +234,10 @@
 
 # blacklist framebuffer modules
 for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*/*fb*); do
-	BLACKLIST="$BLACKLIST $(/usr/bin/basename $x .ko)"
+	BLACKLIST="$BLACKLIST $(basename $x .ko)"
 done
 for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*fb*); do
-	BLACKLIST="$BLACKLIST $(/usr/bin/basename $x .ko)"
+	BLACKLIST="$BLACKLIST $(basename $x .ko)"
 done
 # delete modules that are blacklisted
 BLACKLIST="${BLACKLIST} $(echo ${disablemodules} | sed 's|-|_|g' | sed 's|,| |g')"
@@ -318,11 +322,11 @@
 			showlist "USB    " $(listmods usb/ usb/input)
 			showlist "FW     " $(listmods firewire/) $(listmods ieee1394/)
 			showlist "NET    " $(listmods net/ irda/)
-			showlist "INPUT  " $(listmods input/) $(listmods hid/)
+			showlist "INPUT  " $(listmods input/ pcspkr) $(listmods hid/)
 			showlist "IRDA   " $(listmods irda/)
 			showlist "ISDN   " $(listmods isdn/)
 			showlist "PCMCIA " $(listmods pcmcia/)
-			showlist "SOUND  " $(listmods sound/)
+			showlist "SOUND  " $(listmods pcspkr) $(listmods sound/)
 			showlist "VIDEO  " $(listmods video/)
 			showlist "OTHER  " $(listmods modules/ agp/ acpi/ ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ video/ firewire/ hid/)
 			;;
@@ -340,14 +344,14 @@
 		--show-usb)    showlist "USB    " $(listmods usb/ usb/input) ;;
 		--show-fw)     showlist "FW     " $(listmods firewire/) $(listmods ieee1394/) ;;
 		--show-net)    showlist "NET    " $(listmods net/ irda/) ;;
-		--show-input)  showlist "INPUT  " $(listmods input/) $(listmods hid/) ;;
+		--show-input)  showlist "INPUT  " $(listmods input/ pcspkr) $(listmods hid/) ;;
 		--show-irda)   showlist "IRDA   " $(listmods irda/) ;;
 		--show-isdn)   showlist "ISDN   " $(listmods isdn/) ;;
 		--show-pcmcia) showlist "PCMCIA " $(listmods pcmcia/) ;;
-		--show-sound)  showlist "SOUND  " $(listmods sound/) ;;
+		--show-sound)  showlist "SOUND  " $(listmods pcspkr) $(listmods sound/) ;;
 		--show-video)  showlist "VIDEO  " $(listmods video/) ;;
 		--show-other)  showlist "OTHER  " $(listmods .ko agp/ acpi/ ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ video/ firewire/ hid/) ;;
-		--hostcontroller)  showlist2 "MODULES" \"$(listmods ide/pci) $(listmods ata/pata) $(listmods ata/ata_generic) $(listmods scsi/ /sg.ko /st.ko sr_mod sd_mod) $(listmods message/fusion/) $(listmods drivers/block/  nbd pktcdvd sx8 floppy) $(listmods ata/ pata ata_generic) $(listmods drivers/block/sx8)\" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
+		--hostcontroller)  showlist2 "MODULES" \"$(listmods ide/pci) $(listmods ata/pata) $(listmods ata/ata_generic) $(listmods scsi/ /sg.ko /st.ko sr_mod sd_mod) $(listmods message/fusion/) $(listmods drivers/block/  nbd pktcdvd sx8 floppy) $(listmods ata/ pata ata_generic) $(listmods drivers/block/sx8) $(listmods ehci-hcd) $(listmods uhci-hcd) $(listmods ohci-hcd)\" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
 				;;
 		--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
@@ -362,9 +366,12 @@
 				showlist2 "MODULES"  \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 			fi
 			;;
-		--sound) MODULES_EXPORTED="$MODULES_EXPORTED $(listmods sound/)"
+		--sound) MODULES_EXPORTED="$MODULES_EXPORTED $(listmods pcspkr) $(listmods sound/)"
 			showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 			 ;;
+		--usbhost) MODULES_EXPORTED="$MODULES_EXPORTED $(listmods ehci-hcd) $(listmods uhci-hcd) $(listmods ohci-hcd)"
+			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)