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

[Tobias Powalowski]

    Date: Tuesday, September 8, 2009 @ 14:57:01
  Author: tpowa
Revision: 51475

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

........
  r51474 | tpowa | 2009-09-08 20:56:23 +0200 (Di, 08 Sep 2009) | 2 lines
  
  upgpkg: hwdetect 2009.09-4
      final 8139 fix
........

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

----------+
 PKGBUILD |    4 ++--
 hwdetect |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-08 18:56:23 UTC (rev 51474)
+++ extra-x86_64/PKGBUILD	2009-09-08 18:57:01 UTC (rev 51475)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
 pkgver=2009.09
-pkgrel=3
+pkgrel=4
 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=('09e458425152fb73a96a302ce57543b9')
+md5sums=('ba2ccd49f562b865fb7280e1e3b8b3ee')

Modified: extra-x86_64/hwdetect
===================================================================
--- extra-x86_64/hwdetect	2009-09-08 18:56:23 UTC (rev 51474)
+++ extra-x86_64/hwdetect	2009-09-08 18:57:01 UTC (rev 51475)
@@ -457,18 +457,20 @@
 		--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/)"
+					MODULES_EXPORTED="$(echo $MODULES_EXPORTED | sed -e 's/8139cp//g')"
 					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/8139cp//g' -e 's/(\  /(/g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+					showlist2 "MODULES"  \($BLACKLIST_UDEV $MODULES_EXPORTED\) | sed -e 's/(\  /(/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/)"
+					MODULES_EXPORTED="$(echo $MODULES_EXPORTED | sed -e 's/8139too//g')"
 					BLACKLIST_UDEV=""
 					for i in $MODULES_EXPORTED; do
 						BLACKLIST_UDEV="$BLACKLIST_UDEV !$i"
 					done
-					showlist2 "MODULES"  \($BLACKLIST_UDEV $MODULES_EXPORTED\) | sed -e -e 's/!8139too//g' 's/8139too//g' -e 's/(\  /(/g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+					showlist2 "MODULES"  \($BLACKLIST_UDEV $MODULES_EXPORTED\) | sed -e 's/(\  /(/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/)"