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

Tobias Powalowski tpowa at archlinux.org
Sun Sep 6 14:57:51 UTC 2009


    Date: Sunday, September 6, 2009 @ 10:57:51
  Author: tpowa
Revision: 51248

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

........
  r51246 | tpowa | 2009-09-06 14:52:39 +0000 (So, 06 Sep 2009) | 1 line
........

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

----------+
 PKGBUILD |    6 +++---
 hwdetect |   39 ++++++++++++++++++++++++++++-----------
 2 files changed, 31 insertions(+), 14 deletions(-)


Property changes on: hwdetect/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /hwdetect/trunk:1-47686
   + /hwdetect/trunk:1-51247

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-06 14:53:17 UTC (rev 51247)
+++ extra-i686/PKGBUILD	2009-09-06 14:57:51 UTC (rev 51248)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
-pkgver=2009.07
-pkgrel=2
+pkgver=2009.09
+pkgrel=1
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
 }
-md5sums=('f8a30a2a422cfda4c230bca19bea811f')
+md5sums=('8d6d84df2e19c45c65e76f0bcbdeaadf')

Modified: extra-i686/hwdetect
===================================================================
--- extra-i686/hwdetect	2009-09-06 14:53:17 UTC (rev 51247)
+++ extra-i686/hwdetect	2009-09-06 14:57:51 UTC (rev 51248)
@@ -305,7 +305,8 @@
 grep "ata/"  /tmp/modules-stripped| grep -v "pata" | grep -v "ata_generic" | grep -v "libata" >> /tmp/modules-sorted
 grep "block/" /tmp/modules-stripped | grep "sx8" >> /tmp/modules-sorted
 grep "net/" /tmp/modules-stripped | grep -v "wireless/" | grep -v "usb/" >> /tmp/modules-sorted
-grep "wireless/" /tmp/modules-stripped | grep "staging" >> /tmp/modules-sorted
+grep "wireless/" /tmp/modules-stripped >> /tmp/modules-sorted
+grep "staging/" /tmp/modules-stripped >> /tmp/modules-sorted
 grep "pcmcia/" /tmp/modules-stripped >> /tmp/modules-sorted
 
 # speed up usb module loading
@@ -455,22 +456,38 @@
 				;;
 		--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
-						MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/)"
-					 showlist2 "MODULES"  \($MODULES_EXPORTED\) | 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/) $(listmods drivers/staging/)"
+					BLACKLIST_UDEV=""
+					for i in $MODULES_EXPORTED; do
+						BLACKLIST_UDEV="$BLACKLIST_UDEV !$i"
+					done
+					showlist2 "MODULES"  \($BLACKLIST_UDEV $MODULES_EXPORTED\) | sed -e 's/8139cp//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 				else
 					MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/)"
-					showlist2 "MODULES"  \($MODULES_EXPORTED\) | sed -e 's/8139too//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+					BLACKLIST_UDEV=""
+					for i in $MODULES_EXPORTED; do
+						BLACKLIST_UDEV="$BLACKLIST_UDEV !$i"
+					done
+					showlist2 "MODULES"  \($BLACKLIST_UDEV $MODULES_EXPORTED\) | sed -e 's/8139too//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 				fi
 			else
 				MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/)"
-				showlist2 "MODULES"  \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+				BLACKLIST_UDEV=""
+				for i in $MODULES_EXPORTED; do
+					BLACKLIST_UDEV="$BLACKLIST_UDEV !$i"
+				done
+				showlist2 "MODULES"  \($BLACKLIST_UDEV $MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 			fi
 			;;
 		--sound) MODULES_EXPORTED="$MODULES_EXPORTED $(listmods pcspkr) $(listmods sound/)"
-			showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+			 BLACKLIST_UDEV=""
+			 for i in $MODULES_EXPORTED; do
+				BLACKLIST_UDEV="$BLACKLIST_UDEV !$i"
+			 done
+			 showlist2 "MODULES" \($BLACKLIST_UDEV $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'
+			 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'
 			 ;;
@@ -525,9 +542,9 @@
 done
 
 # cleanup
-rm /tmp/modules-plain
-rm /tmp/modules-sorted
-rm /tmp/modules-stripped
-rm /tmp/moduleslist
+#rm /tmp/modules-plain
+#rm /tmp/modules-sorted
+#rm /tmp/modules-stripped
+#rm /tmp/moduleslist
 
 # vim: set ts=2 sw=2 noet:




More information about the arch-commits mailing list