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

[Tobias Powalowski]

    Date: Saturday, October 6, 2007 @ 07:43:27
  Author: tpowa
    Path: /home/cvs-core/core/base/hwdetect

Modified: PKGBUILD (1.9 -> 1.10) hwdetect (1.7 -> 1.8)

'upgpkg: update hwdetect to new kernel .23 module layout'


----------+
 PKGBUILD |    6 +++---
 hwdetect |   13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)


Index: core/base/hwdetect/PKGBUILD
diff -u core/base/hwdetect/PKGBUILD:1.9 core/base/hwdetect/PKGBUILD:1.10
--- core/base/hwdetect/PKGBUILD:1.9	Tue Sep 18 12:51:39 2007
+++ core/base/hwdetect/PKGBUILD	Sat Oct  6 07:43:27 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.9 2007/09/18 16:51:39 thomas Exp $
+# $Id: PKGBUILD,v 1.10 2007/10/06 11:43:27 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
 pkgver=0.8
-pkgrel=9
+pkgrel=10
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(i686 x86_64)
 license=('custom:none')
@@ -10,9 +10,9 @@
 backup=()
 depends=('bash' 'awk' 'grep' 'coreutils' 'sed')
 source=(hwdetect)
-md5sums=('746ba50b896cc9b4a8fb0c7cf80f365d')
 
 build() {
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
 }
 
+md5sums=('7b26da1222677172ebc36f47187f46a8')
Index: core/base/hwdetect/hwdetect
diff -u core/base/hwdetect/hwdetect:1.7 core/base/hwdetect/hwdetect:1.8
--- core/base/hwdetect/hwdetect:1.7	Mon Jun 11 14:44:44 2007
+++ core/base/hwdetect/hwdetect	Sat Oct  6 07:43:27 2007
@@ -13,7 +13,8 @@
 	echo "    --unload-modules       unload all detected modules"
 	echo "    --show-modules         show all detected modules"
 	echo "    --show-modules-order   shows load order of detected modules"
-	echo "    --show-agp             show AGP modules"	
+	echo "    --show-agp             show AGP modules"
+	echo "    --show-acpi            show ACPI modules"	
 	echo "    --show-ide             show IDE modules"
 	echo "    --show-scsi            show SCSI modules"
 	echo "    --show-sata            show SATA modules"
@@ -346,6 +347,7 @@
 
 		--show-modules)
 			showlist "AGP    " `listmods agp/`
+			showlist "ACPI   " `listmods acpi/`
 			showlist "IDE    " `listmods ide/`
 			showlist "PATA   " `listmods ata/pata` `listmods ata/ata_generic`
 			showlist "SCSI   " `listmods scsi/` `listmods message/fusion/` `listmods drivers/block/ nbd pktcdvd sx8 floppy`
@@ -353,13 +355,13 @@
 			showlist "USB    " `listmods usb/ usb/input`
 			showlist "FW     " `listmods firewire/` `listmods ieee1394/`
 			showlist "NET    " `listmods net/ irda/`
-			showlist "INPUT  " `listmods input/`
+			showlist "INPUT  " `listmods input/` `listmods hid/`
 			showlist "IRDA   " `listmods irda/`
 			showlist "ISDN   " `listmods isdn/`
 			showlist "PCMCIA " `listmods pcmcia/`
 			showlist "SOUND  " `listmods sound/`
 			showlist "VIDEO  " `listmods video/`
-			showlist "OTHER  " `listmods modules/ agp/ ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ 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/`
 			;;
 
 		--show-modules-order)
@@ -367,6 +369,7 @@
 			;;
 
 		--show-agp)    showlist "AGP    " `listmods agp/` ;;
+		--show-acpi)   showlist "ACPI   " `listmods acpi/` ;;
 		--show-ide)    showlist "IDE    " `listmods ide/` ;;
 		--show-pata)   showlist "PATA   " `listmods ata/pata` `listmods ata/ata_generic`;;
 		--show-scsi)   showlist "SCSI   " `listmods scsi/` `listmods message/fusion/` `listmods drivers/block/ nbd pktcdvd sx8 floppy`;;
@@ -374,13 +377,13 @@
 		--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/` ;;
+		--show-input)  showlist "INPUT  " `listmods input/` `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-video)  showlist "VIDEO  " `listmods video/` ;;
-		--show-other)  showlist "OTHER  " `listmods .ko agp/ ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ 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'
 				;;
                 --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