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

[Tobias Powalowski]

    Date: Monday, June 11, 2007 @ 14:44:45
  Author: tpowa
    Path: /home/cvs-arch/arch/build/base/hwdetect

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

'upgpkg: added changes for .22 kernel series'


----------+
 PKGBUILD |    7 ++++---
 hwdetect |   23 ++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)


Index: arch/build/base/hwdetect/PKGBUILD
diff -u arch/build/base/hwdetect/PKGBUILD:1.6 arch/build/base/hwdetect/PKGBUILD:1.7
--- arch/build/base/hwdetect/PKGBUILD:1.6	Sun May  6 15:36:41 2007
+++ arch/build/base/hwdetect/PKGBUILD	Mon Jun 11 14:44:44 2007
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD,v 1.6 2007/05/06 19:36:41 tpowa Exp $
+# $Id: PKGBUILD,v 1.7 2007/06/11 18:44:44 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
 pkgver=0.8
-pkgrel=7
+pkgrel=8
 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=('b1c25aa141e33149b753c2df96649733')
+md5sums=('746ba50b896cc9b4a8fb0c7cf80f365d')
 
 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.6 arch/build/base/hwdetect/hwdetect:1.7
--- arch/build/base/hwdetect/hwdetect:1.6	Sun May  6 15:36:42 2007
+++ arch/build/base/hwdetect/hwdetect	Mon Jun 11 14:44:44 2007
@@ -150,17 +150,17 @@
 	
 		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_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
+		[ "$devid" == "PNP0800" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends pcspkr 2>/dev/null >> /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 2>/dev/null >> /tmp/modules-plain  2>/dev/null
+		[ "$devid" == "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc_sysfs 2>/dev/null >> /tmp/modules-plain
+		[ "$devid" == "PNP0b00" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends rtc_dev 2>/dev/null >> /tmp/modules-plain
+		[ "$devid" == "PNP0510" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends irtty-sir 2>/dev/null >> /tmp/modules-plain 2>/dev/null
+		[ "$devid" == "PNP0511" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends irtty-sir 2>/dev/null >> /tmp/modules-plain 2>/dev/null
+		[ "$devid" == "PNPb02f" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends analog 2>/dev/null >> /tmp/modules-plain 2>/dev/null
 
 		# load ppp-generic if serial ports are detected for modems
-		[ "$devid" == "PNP0501" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends ppp-generic >> /tmp/modules-plain 2>/dev/null
+		[ "$devid" == "PNP0501" ] && modprobe -i --set-version=$KERNEL_VERSION --show-depends ppp-generic 2>/dev/null >> /tmp/modules-plain 2>/dev/null
 	done
 fi
 
@@ -252,6 +252,7 @@
 grep "usblp" /tmp/modules-stripped >> /tmp/modules-sorted
 grep "usbhid" /tmp/modules-stripped >> /tmp/modules-sorted
 grep "usb/" /tmp/modules-stripped | grep -v "usb-storage" | grep -v "usbhid" | grep -v "usblp" >> /tmp/modules-sorted
+grep "firewire/" /tmp/modules-stripped >> /tmp/modules-sorted
 grep "ieee1394/" /tmp/modules-stripped >> /tmp/modules-sorted
 
 # add scsi device modules at the end
@@ -350,7 +351,7 @@
 			showlist "SCSI   " `listmods scsi/` `listmods message/fusion/` `listmods drivers/block/ nbd pktcdvd sx8 floppy`
 			showlist "SATA   " `listmods ata/ pata ata_generic` `listmods drivers/block/sx8`
 			showlist "USB    " `listmods usb/ usb/input`
-			showlist "FW     " `listmods ieee1394/`
+			showlist "FW     " `listmods firewire/` `listmods ieee1394/`
 			showlist "NET    " `listmods net/ irda/`
 			showlist "INPUT  " `listmods input/`
 			showlist "IRDA   " `listmods irda/`
@@ -371,7 +372,7 @@
 		--show-scsi)   showlist "SCSI   " `listmods scsi/` `listmods message/fusion/` `listmods drivers/block/ nbd pktcdvd sx8 floppy`;;
 		--show-sata)   showlist "SATA   " `listmods ata/ pata ata_generic` `listmods drivers/block/sx8` ;;
 		--show-usb)    showlist "USB    " `listmods usb/ usb/input` ;;
-		--show-fw)     showlist "FW     " `listmods ieee1394/` ;;
+		--show-fw)     showlist "FW     " `listmods firewire/` `listmods ieee1394/` ;;
 		--show-net)    showlist "NET    " `listmods net/ irda/` ;;
 		--show-input)  showlist "INPUT  " `listmods input/` ;;
 		--show-irda)   showlist "IRDA   " `listmods irda/` ;;