[arch-commits] Commit in hwdetect/repos (3 files)
Tobias Powalowski
tpowa at archlinux.org
Sun Sep 13 16:35:17 UTC 2009
Date: Sunday, September 13, 2009 @ 12:35:17
Author: tpowa
Revision: 51913
Merged revisions 51911 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/hwdetect/trunk
........
r51911 | tpowa | 2009-09-13 16:33:39 +0000 (So, 13 Sep 2009) | 2 lines
upgpkg: hwdetect 2009.09-5
better 8139 fix
........
Modified:
hwdetect/repos/extra-i686/ (properties)
hwdetect/repos/extra-i686/PKGBUILD
hwdetect/repos/extra-i686/hwdetect
----------+
PKGBUILD | 4 ++--
hwdetect | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
Property changes on: hwdetect/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /hwdetect/trunk:1-51474
+ /hwdetect/trunk:1-51912
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-09-13 16:34:18 UTC (rev 51912)
+++ extra-i686/PKGBUILD 2009-09-13 16:35:17 UTC (rev 51913)
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=hwdetect
pkgver=2009.09
-pkgrel=4
+pkgrel=5
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=('ba2ccd49f562b865fb7280e1e3b8b3ee')
+md5sums=('559ed19d4bdfca0d224192717638a566')
Modified: extra-i686/hwdetect
===================================================================
--- extra-i686/hwdetect 2009-09-13 16:34:18 UTC (rev 51912)
+++ extra-i686/hwdetect 2009-09-13 16:35:17 UTC (rev 51913)
@@ -455,10 +455,10 @@
--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
+ if [ "$(dmesg | grep 'use 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=""
+ BLACKLIST_UDEV="!8139cp"
for i in $MODULES_EXPORTED; do
BLACKLIST_UDEV="$BLACKLIST_UDEV !$i"
done
@@ -466,7 +466,7 @@
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=""
+ BLACKLIST_UDEV="!8139too"
for i in $MODULES_EXPORTED; do
BLACKLIST_UDEV="$BLACKLIST_UDEV !$i"
done
More information about the arch-commits
mailing list