[arch-commits] Commit in hwdetect/repos (3 files)

[Tobias Powalowski]

    Date: Sunday, May 31, 2009 @ 05:53:54
  Author: tpowa
Revision: 40772

Merged revisions 40770 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/hwdetect/trunk

........
  r40770 | tpowa | 2009-05-31 11:48:31 +0200 (So, 31 Mai 2009) | 1 line
  
  upgpkg: hwdetect 2009.05-1
........

Modified:
  hwdetect/repos/extra-x86_64/	(properties)
  hwdetect/repos/extra-x86_64/PKGBUILD
  hwdetect/repos/extra-x86_64/hwdetect

----------+
 PKGBUILD |    4 ++--
 hwdetect |   15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)


Property changes on: hwdetect/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /hwdetect/trunk:1-36023
   + /hwdetect/trunk:1-40771

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-31 09:49:13 UTC (rev 40771)
+++ extra-x86_64/PKGBUILD	2009-05-31 09:53:54 UTC (rev 40772)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
-pkgver=2009.04
+pkgver=2009.05
 pkgrel=1
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(i686 x86_64)
@@ -12,4 +12,4 @@
 build() {
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
 }
-md5sums=('992c5140d9725716bd72748cdcff3507')
+md5sums=('3155cdc6416a17496da6cf0c5bd1c83e')

Modified: extra-x86_64/hwdetect
===================================================================
--- extra-x86_64/hwdetect	2009-05-31 09:49:13 UTC (rev 40771)
+++ extra-x86_64/hwdetect	2009-05-31 09:53:54 UTC (rev 40772)
@@ -205,10 +205,9 @@
 # make a correct order for the modules, internal devices have priority!
 # only use old ide modules if boot parameter 'ide-legacy' is given
 if [ "$IDE_LEGACY" = "1" ]; then
-	grep "ide/" /tmp/modules-stripped >> /tmp/modules-sorted
+	grep "ide/" /tmp/modules-stripped  | grep -v "ide-pci-generic" >> /tmp/modules-sorted
 else
-	grep "ata/pata" /tmp/modules-stripped >> /tmp/modules-sorted
-	grep "ata/ata_generic" /tmp/modules-stripped >> /tmp/modules-sorted
+	grep "ata/pata" /tmp/modules-stripped | grep -v "pata_acpi" >> /tmp/modules-sorted
 fi
 grep "scsi/" /tmp/modules-stripped | grep -v "sd_mod" | grep -v "sr_mod" | grep -v "/sg.ko" | grep -v "/st.ko" >> /tmp/modules-sorted
 grep "block/" /tmp/modules-stripped | grep -v "sx8" | grep -v "nbd" | grep -v "pktcdvd" | grep -v "floppy" >> /tmp/modules-sorted
@@ -319,8 +318,8 @@
 		--show-modules)
 			showlist "AGP    " $(listmods agp/)
 			showlist "ACPI   " $(listmods acpi/)
-			showlist "IDE    " $(listmods ide/)
-			showlist "PATA   " $(listmods ata/pata) $(listmods ata/ata_generic)
+			showlist "IDE    " $(listmods ide/ ide-)
+			showlist "PATA   " $(listmods ata/pata pata_acpi) $(listmods ata/ata_piix) 
 			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)
@@ -341,8 +340,8 @@
 
 		--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-ide)    showlist "IDE    " $(listmods ide/ ide-) ;;
+		--show-pata)   showlist "PATA   " $(listmods ata/pata pata_acpi) $(listmods ata/ata_piix) ;;
 		--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) ;;
@@ -360,7 +359,7 @@
 					 [ "$(grep $i /tmp/.blkid)" ] && FS="$FS $i"
 				  done
 				  ;;
-		--hostcontroller) showlist2 "MODULES" \"$(listmods ide/pci) $(listmods ata/pata) $(listmods ata/ata_generic) $(listmods scsi/ /sg.ko /st.ko scsi_mod 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) $FS\" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
+		--hostcontroller) showlist2 "MODULES" \"$(listmods ide/ ide-) $(listmods ata/pata pata_acpi) $(listmods scsi/ /sg.ko /st.ko scsi_mod 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) $FS\" | 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/) $(listmods drivers/staging/) \) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' | grep '8139cp')" ] ; then
 				if [ "$(cat /proc/modules | grep '8139too')" ]; then