[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2016-01-19 Thread Tobias Powalowski 
Date: Tuesday, January 19, 2016 @ 09:33:35
  Author: tpowa
Revision: 258408

upgpkg: hwdetect 2016.01-1

fix nvme shifting in kernel 4.4

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2016-01-19 08:21:11 UTC (rev 258407)
+++ PKGBUILD2016-01-19 08:33:35 UTC (rev 258408)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski 
 pkgname=hwdetect
-pkgver=2015.01
+pkgver=2016.01
 pkgrel=1
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support"
 arch=(any)
@@ -16,4 +16,5 @@
 package() {
   install -D -m 755 "${srcdir}/hwdetect" "${pkgdir}/usr/bin/hwdetect"
 }
-md5sums=('9010adf5ce888bda4e71a64353f6eabf')
+
+md5sums=('aebf51dea5ab1a0b62fc08fe180e1b59')

Modified: hwdetect
===
--- hwdetect2016-01-19 08:21:11 UTC (rev 258407)
+++ hwdetect2016-01-19 08:33:35 UTC (rev 258408)
@@ -160,7 +160,7 @@
showlist "BLOCK" $(listmods ata/pata pata_acpi) 
$(listmods ata/ata_piix) \
 $(listmods virtio/virtio_pci) 
$(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd 
pktcdvd sx8 floppy) \
 $(listmods ata/ pata ata_generic) 
$(listmods drivers/block/sx8) \
-$(listmods usb/ usb/input) 
$(listmods firewire/) $(listmods ieee1394/)
+$(listmods usb/ usb/input) 
$(listmods firewire/) $(listmods ieee1394/) $(listmods nvme/)
showlist "BLUETOOTH" $(listmods bluetooth/)
showlist "CDROM" $(listmods cdrom/)
showlist "CPUFREQ  " $(listmods cpufreq/)
@@ -193,7 +193,7 @@
--show-block) showlist "BLOCK" $(listmods ata/pata 
pata_acpi) $(listmods ata/ata_piix) \
   $(listmods 
virtio/virtio_pci) $(listmods scsi/) $(listmods message/fusion/) $(listmods 
drivers/block/ nbd pktcdvd sx8 floppy) \
   $(listmods ata/ pata 
ata_generic) $(listmods drivers/block/sx8) \
-  $(listmods usb/ 
usb/input) $(listmods firewire/) $(listmods ieee1394/) ;;
+  $(listmods usb/ 
usb/input) $(listmods firewire/) $(listmods ieee1394/) $(listmods nvme/) ;;
--show-bluetooth) showlist "BLUETOOTH" $(listmods bluetooth/) ;;
--show-cdrom) showlist "CDROM" $(listmods cdrom/) ;;
--show-cpufreq)   showlist "CPUFREQ  " $(listmods cpufreq/) ;;
@@ -223,7 +223,7 @@
MODULES_INITRAMFS="$MODULES_INITRAMFS $FS"
showlist2 "MODULES" \"$MODULES_INITRAMFS\" | 
sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
;;
-   --hostcontroller)HOSTCONTROLLER="$(listmods virtio/virtio_pci) 
$(listmods ata/pata pata_acpi) $(listmods scsi/ /sg.ko /st.ko scsi_mod sr_mod 
sd_mod) $(listmods message/fusion/) $(listmods drivers/block/ virtio_blk nbd 
pktcdvd sx8 floppy) $(listmods ata/ pata ata_generic) $(listmods 
drivers/block/sx8) $(listmods xhci-hcd) $(listmods ehci-hcd) $(listmods 
uhci-hcd) $(listmods ohci-hcd) $(listmods virtio_blk)"
+   --hostcontroller)HOSTCONTROLLER="$(listmods virtio/virtio_pci) 
$(listmods ata/pata pata_acpi) $(listmods scsi/ /sg.ko /st.ko scsi_mod sr_mod 
sd_mod) $(listmods message/fusion/) $(listmods drivers/block/ virtio_blk nbd 
pktcdvd sx8 floppy) $(listmods ata/ pata ata_generic) $(listmods 
drivers/block/sx8) $(listmods xhci-hcd) $(listmods ehci-hcd) $(listmods 
uhci-hcd) $(listmods ohci-hcd) $(listmods virtio_blk) $(listmods nvme/)" 
 MODULES_INITRAMFS="$MODULES_INITRAMFS 
$HOSTCONTROLLER"
 showlist2 "MODULES" \"$MODULES_INITRAMFS\" | 
sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
 ;;

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2015-01-16 Thread Tobias Powalowski 
Date: Friday, January 16, 2015 @ 09:26:49
  Author: tpowa
Revision: 229374

upgpkg: hwdetect 2015.01-1

remove btrfs hook, not needed anymore

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2015-01-16 08:14:45 UTC (rev 229373)
+++ PKGBUILD2015-01-16 08:26:49 UTC (rev 229374)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2013.12
+pkgver=2015.01
 pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('b55e0501dab6599e94c3b5c54c2166bc')
+md5sums=('9010adf5ce888bda4e71a64353f6eabf')

Modified: hwdetect
===
--- hwdetect2015-01-16 08:14:45 UTC (rev 229373)
+++ hwdetect2015-01-16 08:26:49 UTC (rev 229374)
@@ -50,7 +50,6 @@
echo --keymap   add keymap to HOOKS=
echo --pcmcia   add pcmcia to HOOKS=
echo --nfs  add net to HOOKS=
-   echo --btrfsadd btrfs to HOOKS=
exit 1
 }
 
@@ -98,9 +97,6 @@
 # nfs switch
 [ $(echo $* | grep '\-nfs') ]  NFS=1
 
-# btrfs switch
-[ $(echo $* | grep '\-btrfs') ]  BTRFS=1
-
 # hooks switch
 [ $(echo $* | grep '\-hooks') ]  HOOKS=1
 
@@ -247,7 +243,7 @@
if [ $HOOKS_DIR =  ]; then
HOOKS_DIR=/usr/lib/initcpio/install
fi
-   START_HOOKS=base udev keymap autodetect modconf block 
pcmcia net dmraid keyboard $ADVANCED btrfs filesystems fsck
+   START_HOOKS=base udev keymap autodetect modconf block 
pcmcia net dmraid keyboard $ADVANCED filesystems fsck
# remove the ones that don't exist on the system
for i in ${START_HOOKS}; do
if ! [ -e ${HOOKS_DIR}/$i ]; then 
@@ -266,9 +262,6 @@
if ! [ $NFS = 1 ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e 
s/net//g)
fi
-   if ! [ $BTRFS = 1 ]; then
-   START_HOOKS=$(echo $START_HOOKS | sed -e 
s/btrfs//g)
-   fi
echo HOOKS=\$START_HOOKS\ | sed -e 's/\ //g' -e 
's/\ //g' -e 's/\ \ /\ /g'
;;
--advanced) echo $ADVANCED

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-12-15 Thread Tobias Powalowski 
Date: Monday, December 16, 2013 @ 08:56:41
  Author: tpowa
Revision: 201581

upgpkg: hwdetect 2013.12-1

remove shutdown code, obsolete by mkinitcpio 0.16

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2013-12-16 00:30:39 UTC (rev 201580)
+++ PKGBUILD2013-12-16 07:56:41 UTC (rev 201581)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2013.10
-pkgrel=4
+pkgver=2013.12
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('3f7825074b5adfa1abebe4e052b929c6')
+md5sums=('b55e0501dab6599e94c3b5c54c2166bc')

Modified: hwdetect
===
--- hwdetect2013-12-16 00:30:39 UTC (rev 201580)
+++ hwdetect2013-12-16 07:56:41 UTC (rev 201581)
@@ -51,7 +51,6 @@
echo --pcmcia   add pcmcia to HOOKS=
echo --nfs  add net to HOOKS=
echo --btrfsadd btrfs to HOOKS=
-   echo --shutdown add shutdown to HOOKS=
exit 1
 }
 
@@ -102,9 +101,6 @@
 # btrfs switch
 [ $(echo $* | grep '\-btrfs') ]  BTRFS=1
 
-# shutdown switch
-[ $(echo $* | grep '\-shutdown') ]  SHUTDOWN=1
-
 # hooks switch
 [ $(echo $* | grep '\-hooks') ]  HOOKS=1
 
@@ -251,7 +247,7 @@
if [ $HOOKS_DIR =  ]; then
HOOKS_DIR=/usr/lib/initcpio/install
fi
-   START_HOOKS=base udev keymap autodetect modconf block 
pcmcia net dmraid keyboard $ADVANCED btrfs filesystems fsck shutdown
+   START_HOOKS=base udev keymap autodetect modconf block 
pcmcia net dmraid keyboard $ADVANCED btrfs filesystems fsck
# remove the ones that don't exist on the system
for i in ${START_HOOKS}; do
if ! [ -e ${HOOKS_DIR}/$i ]; then 
@@ -273,9 +269,6 @@
if ! [ $BTRFS = 1 ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e 
s/btrfs//g)
fi
-   if ! [ $SHUTDOWN = 1 ]; then
-   START_HOOKS=$(echo $START_HOOKS | sed -e 
s/shutdown//g)
-   fi
echo HOOKS=\$START_HOOKS\ | sed -e 's/\ //g' -e 
's/\ //g' -e 's/\ \ /\ /g'
;;
--advanced) echo $ADVANCED

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-10-08 Thread Tobias Powalowski 
Date: Tuesday, October 8, 2013 @ 12:52:11
  Author: tpowa
Revision: 196207

upgpkg: hwdetect 2013.10-2

cleanup code, remove all loading/unloading and sorting things, systemd/udev 
does everything

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2013-10-08 07:53:37 UTC (rev 196206)
+++ PKGBUILD2013-10-08 10:52:11 UTC (rev 196207)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2013.10
-pkgrel=1
+pkgrel=2
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('f17349465e2d5b2133d78d621988b31e')
+md5sums=('0398c6ee3299ed4471979127ff288ac7')

Modified: hwdetect
===
--- hwdetect2013-10-08 07:53:37 UTC (rev 196206)
+++ hwdetect2013-10-08 10:52:11 UTC (rev 196207)
@@ -9,8 +9,6 @@
echo   Options:
echo --kernel_version=  use kernel version (no autodetect)
echo --kernel_directory=use kernel module directory (no 
autodetect)
-   echo --load-modules load all detected modules
-   echo --unload-modules   unload all detected modules
echo --show-modules show all detected modules
echo --show-modules-order   shows load order of detected modules
echo --show-agp show AGP modules
@@ -117,97 +115,18 @@
 
 : /tmp/modules-plain
 : /tmp/modules-stripped
-: /tmp/modules-sorted
-: /tmp/moduleslist
 : /tmp/.blkid
 
 # generate blkid
 blkid -c /dev/null -s TYPE  /tmp/.blkid
 
-# find pci aliases
+# find modaliases
 aliases=$(find /sys/ -noleaf -name modalias  -exec cat {} +)
 
 # generate files for the different actions
 modprobe -i -a --dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION 
--show-depends $aliases  /tmp/modules-plain 2/dev/null
-
-# find PNP devices like parports, soundcards etc.
-#   (workaround for rtc, pcspkr, irtty-sir and analog are included)
-if [ $(find /sys/devices -noleaf -name 'id' | grep /pnp) ]; then
-   for i in $(find /sys/devices -noleaf -name id | grep /pnp); do
-   devid=$(cat $i | grep PNP)
-   [ $devid ] || continue
-   
-   modprobe -i --set-version=$KERNEL_VERSION --show-depends 
pnp:d${devid}  /tmp/modules-plain 2/dev/null
-   [ $devid = PNP0800 ]  modprobe -i 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends pcspkr 
 /tmp/modules-plain  2/dev/null
-   [ $devid = PNP0510 ]  modprobe -i 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends 
irtty-sir  /tmp/modules-plain 2/dev/null
-   [ $devid = PNP0511 ]  modprobe -i 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends 
irtty-sir  /tmp/modules-plain 2/dev/null
-   [ $devid = PNPb02f ]  modprobe -i 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends analog 
 /tmp/modules-plain 2/dev/null
-
-   # load ppp-generic if serial ports are detected for modems
-   [ $devid = PNP0501 ]  modprobe -i 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends 
ppp-generic  /tmp/modules-plain 2/dev/null
-   done
-fi
-
-# SCSI disks/cdroms/tapes/generic devices
-if [ $(find /sys/devices -noleaf -name 'type') ]; then
-   for i in $(cat $(find /sys/devices -noleaf -name type)); do
-   case $i in (4|5)   modprobe -i --dirname=$KERNEL_DIRECTORY 
--set-version=$KERNEL_VERSION --show-depends sr_mod  /tmp/modules-plain 
2/dev/null ;; esac
-   case $i in (2|3|6|8|9) modprobe -i --dirname=$KERNEL_DIRECTORY 
--set-version=$KERNEL_VERSION --show-depends sg  /tmp/modules-plain 
2/dev/null ;; esac
-   case $i in (0|7|14)modprobe -i --dirname=$KERNEL_DIRECTORY 
--set-version=$KERNEL_VERSION --show-depends sd_mod  /tmp/modules-plain 
2/dev/null ;; esac
-   case $i in (1) modprobe -i --dirname=$KERNEL_DIRECTORY 
--set-version=$KERNEL_VERSION --show-depends st  /tmp/modules-plain 
2/dev/null ;; esac
-   done
-fi
-
-# add Buslogic for vmware
-if [ $VMWARE = 1 ]; then
-modprobe -i --dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION 
--show-depends BusLogic  /tmp/modules-plain 2/dev/null
-fi
-
-# Parport modules
-if [ $(grep 'parport' /tmp/modules-plain) ]; then
-   modprobe -i --dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION 
--show-depends lp  /tmp/modules-plain 2/dev/null
-   modprobe -i --dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-10-08 Thread Tobias Powalowski 
Date: Tuesday, October 8, 2013 @ 15:40:09
  Author: tpowa
Revision: 196210

upgpkg: hwdetect 2013.10-3

remove all temporary files

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2013-10-08 13:38:53 UTC (rev 196209)
+++ PKGBUILD2013-10-08 13:40:09 UTC (rev 196210)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2013.10
-pkgrel=2
+pkgrel=3
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('0398c6ee3299ed4471979127ff288ac7')
+md5sums=('93318a5c5487a9b7c454ea07013d9d46')

Modified: hwdetect
===
--- hwdetect2013-10-08 13:38:53 UTC (rev 196209)
+++ hwdetect2013-10-08 13:40:09 UTC (rev 196210)
@@ -284,5 +284,6 @@
 # cleanup
 rm /tmp/modules-plain
 rm /tmp/modules-stripped
+rm /tmp/.blkid
 
 # vim: set ts=2 sw=2 noet:

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-10-08 Thread Tobias Powalowski 
Date: Tuesday, October 8, 2013 @ 19:39:26
  Author: tpowa
Revision: 196216

upgpkg: hwdetect 2013.10-4

add bluetooth

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |4 +-
 hwdetect |  107 +++--
 2 files changed, 57 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-08 16:59:27 UTC (rev 196215)
+++ PKGBUILD2013-10-08 17:39:26 UTC (rev 196216)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2013.10
-pkgrel=3
+pkgrel=4
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('93318a5c5487a9b7c454ea07013d9d46')
+md5sums=('3f7825074b5adfa1abebe4e052b929c6')

Modified: hwdetect
===
--- hwdetect2013-10-08 16:59:27 UTC (rev 196215)
+++ hwdetect2013-10-08 17:39:26 UTC (rev 196216)
@@ -14,6 +14,7 @@
echo --show-agp show AGP modules
echo --show-acpishow ACPI modules
 echo --show-block   show BLOCK DEVICE modules
+echo --show-bluetooth   show BLUETOOTH modules
 echo --show-cdrom   show CDROM modules
 echo --show-cpufreq show CPUFREQ modules
 echo --show-crypto  show CRYPTO modules
@@ -162,32 +163,33 @@
 while [ -n $*  ]; do
case $1 in
--show-modules)
-   showlist AGP  $(listmods agp/)
-   showlist ACPI $(listmods acpi/)
-   showlist BLOCK$(listmods ata/pata pata_acpi) 
$(listmods ata/ata_piix) \
-   $(listmods virtio/virtio_pci) 
$(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd 
pktcdvd sx8 floppy) \
-   $(listmods ata/ pata ata_generic) 
$(listmods drivers/block/sx8) \
-   $(listmods usb/ usb/input) 
$(listmods firewire/) $(listmods ieee1394/)
-   showlist CDROM$(listmods cdrom/)
-   showlist CPUFREQ  $(listmods cpufreq/)
-   showlist CRYPTO   $(listmods crypto/)
-   showlist DRM  $(listmods drm/)
-   showlist HWMON$(listmods hwmon/)
-   showlist I2C  $(listmods i2c/)
-   showlist INPUT$(listmods input/ pcspkr) 
$(listmods hid/)
-   showlist IRDA $(listmods irda/)
-   showlist ISDN $(listmods isdn/)
-   showlist KVM  $(listmods kvm/)
-   showlist MEDIA$(listmods media/)
-   showlist NET  $(listmods net/ irda/)
-   showlist PARPORT  $(listmods parport/)
-   showlist PCMCIA   $(listmods pcmcia/)
-   showlist SOUND$(listmods pcspkr) $(listmods 
sound/)
-   showlist STAGING  $(listmods staging/)
-   showlist TPM  $(listmods tpm/)
-   showlist WATCHDOG $(listmods watchdog/)
-   showlist OTHER$(listmods modules/ agp/ acpi/ 
scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 
block/virtio virtio/virtio_pci ata/ \
-   usb/ ieee1394 cdrom/ cpufreq/ 
crypto/ net/ hwmon/ i2c/ isdn/ input/ irda/ kvm/ media/ parport/ pcmcia/ sound/ 
tpm/ drm/ firewire/ hid/ staging/ watchdog/)
+   showlist AGP   $(listmods agp/)
+   showlist ACPI  $(listmods acpi/)
+   showlist BLOCK $(listmods ata/pata pata_acpi) 
$(listmods ata/ata_piix) \
+$(listmods virtio/virtio_pci) 
$(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd 
pktcdvd sx8 floppy) \
+$(listmods ata/ pata ata_generic) 
$(listmods drivers/block/sx8) \
+$(listmods usb/ usb/input) 
$(listmods firewire/) $(listmods ieee1394/)
+   showlist BLUETOOTH $(listmods bluetooth/)
+   showlist CDROM $(listmods cdrom/)
+   showlist CPUFREQ   $(listmods cpufreq/)
+   showlist CRYPTO$(listmods crypto/)
+   showlist DRM   $(listmods drm/)
+   showlist HWMON $(listmods hwmon/)
+   showlist I2C   $(listmods i2c/)
+   showlist INPUT $(listmods

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-10-07 Thread Tobias Powalowski 
Date: Monday, October 7, 2013 @ 22:46:43
  Author: tpowa
Revision: 196175

upgpkg: hwdetect 2013.10-1

add more output options

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |6 +--
 hwdetect |   98 -
 2 files changed, 68 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-07 19:32:33 UTC (rev 196174)
+++ PKGBUILD2013-10-07 20:46:43 UTC (rev 196175)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2013.08
-pkgrel=2
+pkgver=2013.10
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('1ffabf5db0f3b98336045a5ba1580454')
+md5sums=('f17349465e2d5b2133d78d621988b31e')

Modified: hwdetect
===
--- hwdetect2013-10-07 19:32:33 UTC (rev 196174)
+++ hwdetect2013-10-07 20:46:43 UTC (rev 196175)
@@ -16,14 +16,24 @@
echo --show-agp show AGP modules
echo --show-acpishow ACPI modules
 echo --show-block   show BLOCK DEVICE modules
-   echo --show-net show NETWORK modules
-   echo --show-drm show DRM modules
+echo --show-cdrom   show CDROM modules
+echo --show-cpufreq show CPUFREQ modules
+echo --show-crypto  show CRYPTO modules
+echo --show-drm show DRM modules
+echo --show-hwmon   show HWMON modules
+echo --show-i2c show I2C modules
echo --show-input   show INPUT modules
echo --show-irdashow IRDA modules
echo --show-isdnshow ISDN modules
-   echo --show-pcmcia  show PCMCIA modules
+echo --show-kvm show KVM modules
+echo --show-media   show MEDIA modules
+   echo --show-net show NETWORK modules
+   echo --show-parport show PARPORT modules
+   echo --show-pcmcia  show PCMCIA modules
echo --show-sound   show SOUND modules
echo --show-staging show STAGING modules
+echo --show-tpm show TPM modules
+echo --show-watchdogshow WATCHDOG modules
echo --show-other   show OTHER modules
echo 
echo   For /etc/mkinitcpio.conf use:
@@ -247,21 +257,32 @@
;;
 
--show-modules)
-   showlist AGP $(listmods agp/)
-   showlist ACPI$(listmods acpi/)
-   showlist BLOCK   $(listmods ata/pata pata_acpi) 
$(listmods ata/ata_piix) \
- $(listmods virtio/virtio_pci) 
$(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd 
pktcdvd sx8 floppy) \
- $(listmods ata/ pata 
ata_generic) $(listmods drivers/block/sx8) \
- $(listmods usb/ usb/input) 
$(listmods firewire/) $(listmods ieee1394/)
-   showlist NET $(listmods net/ irda/)
-   showlist DRM $(listmods drm/)
-   showlist INPUT   $(listmods input/ pcspkr) $(listmods 
hid/)
-   showlist IRDA$(listmods irda/)
-   showlist ISDN$(listmods isdn/)
-   showlist PCMCIA  $(listmods pcmcia/)
-   showlist SOUND   $(listmods pcspkr) $(listmods sound/)
-   showlist STAGING $(listmods staging/)
-   showlist OTHER   $(listmods modules/ agp/ acpi/ scsi/ 
message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 block/virtio 
virtio/virtio_pci ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ 
drm/ firewire/ hid/ staging/)
+   showlist AGP  $(listmods agp/)
+   showlist ACPI $(listmods acpi/)
+   showlist BLOCK$(listmods ata/pata pata_acpi) 
$(listmods ata/ata_piix) \
+  $(listmods virtio/virtio_pci) 
$(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd 
pktcdvd sx8 floppy) \
+  $(listmods ata/ pata ata_generic) 
$(listmods drivers/block/sx8) \
+  $(listmods usb/ usb/input) 
$(listmods firewire/) $(listmods ieee1394/)
+   showlist CDROM$(listmods cdrom/)
+

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-08-22 Thread Tobias Powalowski 
Date: Thursday, August 22, 2013 @ 13:59:21
  Author: tpowa
Revision: 193526

upgpkg: hwdetect 2013.08-2

remove not needed framebuffer parts and uvesafb

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |4 ++--
 hwdetect |   23 +--
 2 files changed, 3 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-22 05:37:20 UTC (rev 193525)
+++ PKGBUILD2013-08-22 11:59:21 UTC (rev 193526)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2013.08
-pkgrel=1
+pkgrel=2
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('c40773ccf82b1a7da2d29d5fd4f7aefc')
+md5sums=('1ffabf5db0f3b98336045a5ba1580454')

Modified: hwdetect
===
--- hwdetect2013-08-22 05:37:20 UTC (rev 193525)
+++ hwdetect2013-08-22 11:59:21 UTC (rev 193526)
@@ -78,9 +78,6 @@
KERNEL_VERSION=$(uname -r)
 fi
 
-# uvesafb switch
-[ $(echo $* | grep '\-uvesafb') ]  UVESAFB=1
-
 # dmraid switch
 [ $(echo $* | grep '\-dmraid') ]  DMRAID=1
 
@@ -310,26 +307,11 @@
MODULES_INITRAMFS=$KMS $MODULES_INITRAMFS
showlist2 MODULES \$MODULES_INITRAMFS\ | 
sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g'
;;
-   --uvesafb)  FB=uvesafb
-   MODULES_INITRAMFS=$FB $MODULES_INITRAMFS
-   ! [ $HOOKS = 1 ]  showlist2 MODULES 
\$MODULES_INITRAMFS\ | sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 
's/\ \ /\ /g'
-   ;;
-   --fbmodule) FB=
-   for i in $(cat 
/etc/modprobe.d/framebuffer_blacklist.conf); do
-   i=$(echo $i | sed -e 's/blacklist //g')
-   # check if already in FB array, to avoid 
double entries
-   if [ $(cat /proc/modules | grep ^$i) ]; 
then
-   ! [ $(grep -w $FB) ]  FB=$i
-   fi
-done
-   MODULES_INITRAMFS=$FB $MODULES_INITRAMFS 
-   ! [ $HOOKS = 1 ]  showlist2 MODULES 
\$MODULES_INITRAMFS\ | sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 
's/\ \ /\ /g'
-   ;;
--hooks) 
if [ $HOOKS_DIR =  ]; then
HOOKS_DIR=/usr/lib/initcpio/install
fi
-   START_HOOKS=base v86d udev keymap autodetect modconf 
block pcmcia net dmraid keyboard $ADVANCED btrfs filesystems fsck shutdown
+   START_HOOKS=base udev keymap autodetect modconf block 
pcmcia net dmraid keyboard $ADVANCED btrfs filesystems fsck shutdown
# remove the ones that don't exist on the system
for i in ${START_HOOKS}; do
if ! [ -e ${HOOKS_DIR}/$i ]; then 
@@ -339,9 +321,6 @@
if ! [ $KEYMAP = 1 ]; then 
START_HOOKS=$(echo $START_HOOKS | sed -e 
s/keymap//g)
fi
-   if ! [ $UVESAFB = 1 ]; then 
-   START_HOOKS=$(echo $START_HOOKS | sed -e 
s/v86d//g)
-   fi
if ! [ $DMRAID = 1 ]; then 
START_HOOKS=$(echo $START_HOOKS | sed -e 
s/dmraid//g)
fi

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-08-07 Thread Tobias Powalowski 
Date: Wednesday, August 7, 2013 @ 16:42:42
  Author: tpowa
Revision: 192201

upgpkg: hwdetect 2013.08-1

big simplify of advanced hook detection

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2013-08-07 14:09:10 UTC (rev 192200)
+++ PKGBUILD2013-08-07 14:42:42 UTC (rev 192201)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2013.07
+pkgver=2013.08
 pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('a3c84221a91a32e55deff0edb1e00fc1')
+md5sums=('c40773ccf82b1a7da2d29d5fd4f7aefc')

Modified: hwdetect
===
--- hwdetect2013-08-07 14:09:10 UTC (rev 192200)
+++ hwdetect2013-08-07 14:42:42 UTC (rev 192201)
@@ -105,101 +105,7 @@
 ADVANCED=
 # root device check
 if ! [ $ROOTDEVICE =  ]; then
-# check device mapper devices
-   if [ $(echo $ROOTDEVICE | grep /dev/mapper) ]; then
-   # check if encryption is used
-   if [ $(cryptsetup status $ROOTDEVICE 2/dev/null) ]; then
-   ADVANCED=encrypt
-   # check on lvm
-   realdevice=$(cryptsetup status $ROOTDEVICE 2/dev/null 
| grep device:.*/dev/mapper/ | sed -e 's#.*\ ##g')
-   if [ $(lvs $realdevice 2/dev/null) ]; then
-   ADVANCED=lvm2 encrypt
-   vg=$(echo $(lvs -o vg_name --noheading 
$realdevice))
-   # check on raid
-   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]  ADVANCED=mdadm_udev lvm2 encrypt
-   fi
-   # check on raid
-   if [ $(cryptsetup status $ROOTDEVICE 2/dev/null | 
grep device:.*/dev/md | sed -e 's#.*\ ##g') ]; then
-   ADVANCED=mdadm_udev encrypt
-   realdevice=$(cryptsetup status $ROOTDEVICE 
2/dev/null | grep device:.*/dev/md | sed -e 's#.*\ ##g')
-   # check on lvm
-   [ $(mdadm --detail $realdevice | grep 
/dev/dm-) ]  ADVANCED=lvm2 mdadm_udev encrypt
-   fi
-   fi
-   # check if lvm is used
-   if [ $(lvs $ROOTDEVICE 2/dev/null) ]; then
-   ADVANCED=lvm2
-   vg=$(echo $(lvs -o vg_name --noheading $ROOTDEVICE))
-   # check on encrypt
-   if [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/dm-) ]; then 
-   ADVANCED=encrypt lvm2
-   # check on raid
-   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]  ADVANCED=mdadm_udev encrypt lvm2
-   for i in $(pvs -o pv_name,vg_name --noheading 
| grep $vg$ | grep /dev/dm-); do
-   realdevice=$(echo $i | cut -d ' ' -f1)
-   #getsymlink=$(readlink $realdevice)
-   #correctdevice=$(echo $getsymlink | 
sed -e 's#\.\.#/dev#g')
-   [ $(cryptsetup status $realdevice 
2/dev/null | grep device:.*/dev/md) ]  ADVANCED=mdadm_udev encrypt lvm2
-   done
-   fi
-   # check on raid
-   if [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]; then
-   ADVANCED=mdadm_udev lvm2
-   #check on encrypt
-   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/dm-) ]  ADVANCED=encrypt mdadm_udev lvm2
-   for i in $(pvs -o pv_name,vg_name --noheading 
| grep $vg$ | grep /dev/md); do
-   realdevice=$(echo $i | cut -d ' ' -f1)
-   [ $(mdadm --detail $realdevice | grep 
/dev/dm-) ]  ADVANCED=encrypt mdadm_udev lvm2
-   done
-   fi
-   fi
-   fi
-   # check md device
-   if [ $(echo $ROOTDEVICE | grep /dev/md) ]; then
-   ADVANCED=mdadm_udev
-   # raid partitions or raid?
-   if [ $(echo $ROOTDEVICE | grep /dev/md*p) ]; then
-   realdevice=$(echo $ROOTDEVICE | sed -e 's#p.*##g' -e 
's#/dev/##g')
-

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-07-29 Thread Tobias Powalowski 
Date: Monday, July 29, 2013 @ 16:50:07
  Author: tpowa
Revision: 191718

upgpkg: hwdetect 2013.07-1

replace mdadm with mdadm_udev hook

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2013-07-29 14:03:23 UTC (rev 191717)
+++ PKGBUILD2013-07-29 14:50:07 UTC (rev 191718)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2013.06
-pkgrel=2
+pkgver=2013.07
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('8fb738c159c9e8b397473f6834d9')
+md5sums=('a3c84221a91a32e55deff0edb1e00fc1')

Modified: hwdetect
===
--- hwdetect2013-07-29 14:03:23 UTC (rev 191717)
+++ hwdetect2013-07-29 14:50:07 UTC (rev 191718)
@@ -116,14 +116,14 @@
ADVANCED=lvm2 encrypt
vg=$(echo $(lvs -o vg_name --noheading 
$realdevice))
# check on raid
-   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]  ADVANCED=mdadm lvm2 encrypt
+   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]  ADVANCED=mdadm_udev lvm2 encrypt
fi
# check on raid
if [ $(cryptsetup status $ROOTDEVICE 2/dev/null | 
grep device:.*/dev/md | sed -e 's#.*\ ##g') ]; then
-   ADVANCED=mdadm encrypt
+   ADVANCED=mdadm_udev encrypt
realdevice=$(cryptsetup status $ROOTDEVICE 
2/dev/null | grep device:.*/dev/md | sed -e 's#.*\ ##g')
# check on lvm
-   [ $(mdadm --detail $realdevice | grep 
/dev/dm-) ]  ADVANCED=lvm2 mdadm encrypt
+   [ $(mdadm --detail $realdevice | grep 
/dev/dm-) ]  ADVANCED=lvm2 mdadm_udev encrypt
fi
fi
# check if lvm is used
@@ -134,29 +134,29 @@
if [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/dm-) ]; then 
ADVANCED=encrypt lvm2
# check on raid
-   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]  ADVANCED=mdadm encrypt lvm2
+   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]  ADVANCED=mdadm_udev encrypt lvm2
for i in $(pvs -o pv_name,vg_name --noheading 
| grep $vg$ | grep /dev/dm-); do
realdevice=$(echo $i | cut -d ' ' -f1)
#getsymlink=$(readlink $realdevice)
#correctdevice=$(echo $getsymlink | 
sed -e 's#\.\.#/dev#g')
-   [ $(cryptsetup status $realdevice 
2/dev/null | grep device:.*/dev/md) ]  ADVANCED=mdadm encrypt lvm2
+   [ $(cryptsetup status $realdevice 
2/dev/null | grep device:.*/dev/md) ]  ADVANCED=mdadm_udev encrypt lvm2
done
fi
# check on raid
if [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]; then
-   ADVANCED=mdadm lvm2
+   ADVANCED=mdadm_udev lvm2
#check on encrypt
-   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/dm-) ]  ADVANCED=encrypt mdadm lvm2
+   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/dm-) ]  ADVANCED=encrypt mdadm_udev lvm2
for i in $(pvs -o pv_name,vg_name --noheading 
| grep $vg$ | grep /dev/md); do
realdevice=$(echo $i | cut -d ' ' -f1)
-   [ $(mdadm --detail $realdevice | grep 
/dev/dm-) ]  ADVANCED=encrypt mdadm lvm2
+   [ $(mdadm --detail $realdevice | grep 
/dev/dm-) ]  ADVANCED=encrypt mdadm_udev lvm2
done
fi
fi
fi
# check md device
if [ $(echo $ROOTDEVICE | grep /dev/md) ]; then
-   ADVANCED=mdadm
+   ADVANCED=mdadm_udev
# raid partitions or raid?

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-06-06 Thread Tobias Powalowski 
Date: Thursday, June 6, 2013 @ 17:05:42
  Author: tpowa
Revision: 187823

upgpkg: hwdetect 2013.06-2

remove not needed functions and rc.conf listings

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2013-06-06 15:03:16 UTC (rev 187822)
+++ PKGBUILD2013-06-06 15:05:42 UTC (rev 187823)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2013.06
-pkgrel=1
+pkgrel=2
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('2a14a8d06e8ede72891559ac1f491d3d')
+md5sums=('8fb738c159c9e8b397473f6834d9')

Modified: hwdetect
===
--- hwdetect2013-06-06 15:03:16 UTC (rev 187822)
+++ hwdetect2013-06-06 15:05:42 UTC (rev 187823)
@@ -1,7 +1,6 @@
 #! /bin/sh
 # Autodetection script for scanning /sys for hardware
 # for Archlinux by Tobias Powalowski tp...@archlinux.org
-# '--modules-not-loaded' patch by Grzegorz Wierzowiecki 
grzegorz.wierzowiecki_4t_pjwstk.edu.pl
 usage () {
echo $0 [options]
echo 
@@ -26,8 +25,6 @@
echo --show-sound   show SOUND modules
echo --show-staging show STAGING modules
echo --show-other   show OTHER modules
-   echo --modules  show all detected MODULES
-   echo --modules-not-loaded   show all detected MODULES but not 
actually loaded
echo 
echo   For /etc/mkinitcpio.conf use:
echo --filesystem   add filesystems to MODULES=
@@ -329,27 +326,6 @@
echo 
 }
 
-showlist3() {
-   cat=$1 ; shift
-   [ $# -gt 0 ] || return
-   for i in $*; do echo -n $i ; done
-   echo 
-}
-
-showlist4() {
-   cat=$1 ; shift
-   [ $# -gt 0 ] || return
-   echo -n $cat=(\${MODULES[*]} 
-   lsmod  /tmp/modules-showlist4-$$
-   for i in $*; do
-   if ! grep -sq $(echo $i|tr - _) /tmp/modules-showlist4-$$ ; then
-   echo -n $i ;
-   fi
-   done
-   echo )
-   rm /tmp/modules-showlist4-$$
-}
-
 # starting different actions
 while [ -n $*  ]; do
case $1 in
@@ -443,10 +419,6 @@
MODULES_INITRAMFS=$FB $MODULES_INITRAMFS 
! [ $HOOKS = 1 ]  showlist2 MODULES 
\$MODULES_INITRAMFS\ | sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 
's/\ \ /\ /g'
;;
-   --modules) showlist2 MODULES \($(listmods modules/)\) | sed 
-e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
-;;
-   --modules-not-loaded) showlist4 MODULES $(listmods modules/) 
| sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
-;;
--hooks) 
if [ $HOOKS_DIR =  ]; then
HOOKS_DIR=/usr/lib/initcpio/install

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-06-03 Thread Tobias Powalowski 
Date: Monday, June 3, 2013 @ 17:21:36
  Author: tpowa
Revision: 187085

upgpkg: hwdetect 2013.06-1

add f2fs support

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2013-06-03 11:23:42 UTC (rev 187084)
+++ PKGBUILD2013-06-03 15:21:36 UTC (rev 187085)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2013.02
-pkgrel=2
+pkgver=2013.06
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/usr/bin/hwdetect
 }
-md5sums=('894a3f1d481179651af00278f7638084')
+md5sums=('2a14a8d06e8ede72891559ac1f491d3d')

Modified: hwdetect
===
--- hwdetect2013-06-03 11:23:42 UTC (rev 187084)
+++ hwdetect2013-06-03 15:21:36 UTC (rev 187085)
@@ -404,7 +404,7 @@
--show-staging) showlist STAGING $(listmods staging/) ;;
--show-drm)  showlist DRM   $(listmods drm/) ;;
--show-other)  showlist OTHER   $(listmods .ko agp/ acpi/ 
scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 
block/virtio virtio/virtio_pci ata/ usb/ ieee1394 net/ isdn/ input/ irda/ 
pcmcia/ sound/ drm/ firewire/ hid/ staging/) ;;
-   --filesystem)   FILESYSTEM=ext2 ext3 ext4 nilfs2 btrfs 
reiserfs xfs jfs vfat
+   --filesystem)   FILESYSTEM=ext2 ext3 ext4 f2fs nilfs2 btrfs 
reiserfs xfs jfs vfat
for i in $FILESYSTEM; do
 [ $(grep $i /tmp/.blkid) ]  
FS=$FS $i
done

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2013-02-01 Thread Tobias Powalowski 
Date: Friday, February 1, 2013 @ 13:30:11
  Author: tpowa
Revision: 176845

upgpkg: hwdetect 2013.02-1

new release with recent mkinitcpio changes

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |6 +--
 hwdetect |  113 +++--
 2 files changed, 24 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-01 12:17:04 UTC (rev 176844)
+++ PKGBUILD2013-02-01 12:30:11 UTC (rev 176845)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2012.04
-pkgrel=2
+pkgver=2013.02
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('e442044d3e9fbaf2927a6fe62a40975e')
+md5sums=('894a3f1d481179651af00278f7638084')

Modified: hwdetect
===
--- hwdetect2013-02-01 12:17:04 UTC (rev 176844)
+++ hwdetect2013-02-01 12:30:11 UTC (rev 176845)
@@ -10,28 +10,24 @@
echo   Options:
echo --kernel_version=  use kernel version (no autodetect)
echo --kernel_directory=use kernel module directory (no 
autodetect)
-   echo --ide-legacy   use old ide modules instead of pata
echo --load-modules load all detected modules
echo --unload-modules   unload all detected modules
echo --show-modules show all detected modules
echo --show-modules-order   shows load order of detected modules
echo --show-agp show AGP modules
-   echo --show-acpishow ACPI modules 
-   echo --show-ide show IDE modules
-   echo --show-patashow PATA modules
-   echo --show-scsishow SCSI modules
-   echo --show-satashow SATA modules
-   echo --show-usb show USB modules
-   echo --show-fw  show FIREWIRE modules
+   echo --show-acpishow ACPI modules
+echo --show-block   show BLOCK DEVICE modules
echo --show-net show NETWORK modules
+   echo --show-drm show DRM modules
echo --show-input   show INPUT modules
echo --show-irdashow IRDA modules
echo --show-isdnshow ISDN modules
echo --show-pcmcia  show PCMCIA modules
echo --show-sound   show SOUND modules
echo --show-staging show STAGING modules
-   echo --show-video   show VIDEO modules
echo --show-other   show OTHER modules
+   echo --modules  show all detected MODULES
+   echo --modules-not-loaded   show all detected MODULES but not 
actually loaded
echo 
echo   For /etc/mkinitcpio.conf use:
echo --filesystem   add filesystems to MODULES=
@@ -46,21 +42,10 @@
echo --hooksshow HOOKS=
echo --dmraid   add dmraid to HOOKS=
echo --keymap   add keymap to HOOKS=
-   echo --usb  add usb to HOOKS=
-   echo --usbinput add usbinput to HOOKS=
-   echo --fw   add fw to HOOKS=
echo --pcmcia   add pcmcia to HOOKS=
echo --nfs  add net to HOOKS=
echo --btrfsadd btrfs to HOOKS=
echo --shutdown add shutdown to HOOKS=
-   echo 
-   echo   For persistent sound and network files use:
-   echo --net  generate /tmp/network_persistent.rules
-   echo --soundgenerate /tmp/sound_persistent.conf
-   echo 
-   echo --modules  show all detected MODULES
-   echo --modules-not-loaded   show all detected MODULES but not 
actually loaded
-   echo 
exit 1
 }
 
@@ -96,9 +81,6 @@
KERNEL_VERSION=$(uname -r)
 fi
 
-# IDE/PATA switch
-[ $(echo $* | grep '\-ide-legacy') ]  IDE_LEGACY=1
-
 # uvesafb switch
 [ $(echo $* | grep '\-uvesafb') ]  UVESAFB=1
 
@@ -108,15 +90,6 @@
 # keymap switch
 [ $(echo $* | grep '\-keymap') ]  KEYMAP=1
 
-# usb switch
-[ $(echo $* | grep '\-usb ') ]  USB=1
-
-# usbinput switch
-[ $(echo $* | grep '\-usbinput') ]  USBINPUT=1
-
-# fw switch
-[ $(echo $* | grep '\-fw') ]  FW=1
-
 # pcmcia switch
 [ $(echo $* | grep '\-pcmcia') ]  PCMCIA=1
 
@@ -247,11 +220,6 @@
 # generate files for the different actions
 modprobe -i -a --dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION 
--show-depends $aliases

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2012-04-21 Thread Tobias Powalowski 
Date: Saturday, April 21, 2012 @ 05:42:34
  Author: tpowa
Revision: 156580

upgpkg: hwdetect 2012.04-2

cleanup and fix many things

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |4 +--
 hwdetect |   62 ++---
 2 files changed, 29 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-21 07:48:29 UTC (rev 156579)
+++ PKGBUILD2012-04-21 09:42:34 UTC (rev 156580)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2012.04
-pkgrel=1
+pkgrel=2
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('bd84fbd91a00a86c0d3a4c8f72377a2b')
+md5sums=('e442044d3e9fbaf2927a6fe62a40975e')

Modified: hwdetect
===
--- hwdetect2012-04-21 07:48:29 UTC (rev 156579)
+++ hwdetect2012-04-21 09:42:34 UTC (rev 156580)
@@ -68,19 +68,30 @@
 [ $1 = --help ]  usage
 [ $1 = -h ]  usage
 
-# setting kernel version
-case $1 in
-   --kernel_directory=*)
-   KERNEL_DIRECTORY=$(echo $1 | awk -F= '{print $2;}')
-   ;;
-   --kernel_version=*)
-   KERNEL_VERSION=$(echo $1 | awk -F= '{print $2;}')
-   ;;
-   --rootdevice=*)
-   ROOTDEVICE=$(echo $1 | awk -F= '{print $2;}')
-   ;;
-esac
+# setting parameters
+PARAMETER=$(echo $*)
+parameter() {
+   while [ -n $1 ]; do
+   case $1 in
+   --kernel_directory=*)
+   KERNEL_DIRECTORY=$(echo $1 | awk -F= '{print $2;}')
+   ;;
+   --kernel_version=*)
+   KERNEL_VERSION=$(echo $1 | awk -F= '{print $2;}')
+   ;;
+   --rootdevice=*)
+   ROOTDEVICE=$(echo $1 | awk -F= '{print $2;}')
+   ;;
+   -hooks-dir=*|--hooks-dir=*)
+   HOOKS_DIR=$(echo $1 | awk -F= '{print $2;}')
+   ;;
+   esac
+   shift
+   done
+}
 
+parameter $PARAMETER
+
 if [ $KERNEL_VERSION =  ]; then
KERNEL_VERSION=$(uname -r)
 fi
@@ -221,12 +232,6 @@
fi
 fi
 
-# checking /sys
-if ! [ -d /sys/ ]; then
-   echo /sys/ is not present -- mount /sys first 2
-   exit 1
-fi
-
 : /tmp/modules-plain
 : /tmp/modules-stripped
 : /tmp/modules-sorted
@@ -234,17 +239,11 @@
 : /tmp/.blkid
 
 # generate blkid
-/sbin/blkid -c /dev/null -s TYPE  /tmp/.blkid
+blkid -c /dev/null -s TYPE  /tmp/.blkid
 
 # find pci aliases
 aliases=$(find /sys/ -noleaf -name modalias  -exec cat {} +)
 
-# check for empty aliases
-if [ $aliases =  ]; then
-   echo hwdetect aborted -- you need a kernel = 2.6.12 2
-   exit 1
-fi
-
 # generate files for the different actions
 modprobe -i -a --dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION 
--show-depends $aliases  /tmp/modules-plain 2/dev/null
 
@@ -389,19 +388,12 @@
 }
 
 # starting different actions
-while [ $# -gt 0 ]; do
+while [ -n $*  ]; do
case $1 in
-   -hooks-dir=*|--hooks-dir=*)
-   HOOKS_DIR=$(echo $1 | awk -F= '{print $2;}')
-;;
--load-modules)
# load all detected pci modules
for i in $(cat /tmp/moduleslist); do
-   if [ -e /lib/udev/load-modules.sh ]; then 
-   /lib/udev/load-modules.sh $i  
/dev/null 21
-   else
-   modprobe $i  /dev/null 21
-   fi
+   modprobe $i  /dev/null 21
done
;;
 
@@ -513,7 +505,7 @@
 ;;
--hooks) 
if [ $HOOKS_DIR =  ]; then
-   HOOKS_DIR=/lib/initcpio/install
+   HOOKS_DIR=/usr/lib/initcpio/install
fi
START_HOOKS=base v86d udev keymap fsck autodetect ide 
pata scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED btrfs filesystems 
shutdown
# remove the ones that don't exist on the system

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2012-04-20 Thread Tobias Powalowski 
Date: Friday, April 20, 2012 @ 06:42:33
  Author: tpowa
Revision: 156522

upgpkg: hwdetect 2012.04-1

add kernel_directory option

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |4 ++--
 hwdetect |   32 ++--
 2 files changed, 20 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-20 06:48:44 UTC (rev 156521)
+++ PKGBUILD2012-04-20 10:42:33 UTC (rev 156522)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2012.01
+pkgver=2012.04
 pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('cdb979d7642145274bd1e57a8c4b9b83')
+md5sums=('bd84fbd91a00a86c0d3a4c8f72377a2b')

Modified: hwdetect
===
--- hwdetect2012-04-20 06:48:44 UTC (rev 156521)
+++ hwdetect2012-04-20 10:42:33 UTC (rev 156522)
@@ -9,6 +9,7 @@
echo 
echo   Options:
echo --kernel_version=  use kernel version (no autodetect)
+   echo --kernel_directory=use kernel module directory (no 
autodetect)
echo --ide-legacy   use old ide modules instead of pata
echo --load-modules load all detected modules
echo --unload-modules   unload all detected modules
@@ -69,6 +70,9 @@
 
 # setting kernel version
 case $1 in
+   --kernel_directory=*)
+   KERNEL_DIRECTORY=$(echo $1 | awk -F= '{print $2;}')
+   ;;
--kernel_version=*)
KERNEL_VERSION=$(echo $1 | awk -F= '{print $2;}')
;;
@@ -242,11 +246,11 @@
 fi
 
 # generate files for the different actions
-modprobe -i -a --set-version=$KERNEL_VERSION --show-depends $aliases  
/tmp/modules-plain 2/dev/null
+modprobe -i -a --dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION 
--show-depends $aliases  /tmp/modules-plain 2/dev/null
 
 # fix ide cdrom detection on proliant 1600
 if [ $(echo $aliases | grep 
'pci:v0E11d0001svsdbc06sc02i00') ]; then
-   modprobe -i --set-version=$KERNEL_VERSION --show-depends ide-generic  
/tmp/modules-plain 2/dev/null
+   modprobe -i --dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION 
--show-depends ide-generic  /tmp/modules-plain 2/dev/null
 fi
 
 # find PNP devices like parports, soundcards etc.
@@ -257,35 +261,35 @@
[ $devid ] || continue

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 = 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 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends pcspkr 
 /tmp/modules-plain  2/dev/null
+   [ $devid = PNP0510 ]  modprobe -i 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends 
irtty-sir  /tmp/modules-plain 2/dev/null
+   [ $devid = PNP0511 ]  modprobe -i 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends 
irtty-sir  /tmp/modules-plain 2/dev/null
+   [ $devid = PNPb02f ]  modprobe -i 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends analog 
 /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 
--dirname=$KERNEL_DIRECTORY --set-version=$KERNEL_VERSION --show-depends 
ppp-generic  /tmp/modules-plain 2/dev/null
done
 fi
 
 # SCSI disks/cdroms/tapes/generic devices
 if [ $(find /sys/devices -noleaf -name 'type') ]; then
for i in $(cat $(find /sys/devices -noleaf -name type)); do
-   case $i in (4|5)   modprobe -i 
--set-version=$KERNEL_VERSION --show-depends sr_mod  /tmp/modules-plain 
2/dev/null ;; esac
-   case $i in (2|3|6|8|9) modprobe -i 
--set-version=$KERNEL_VERSION --show-depends sg  /tmp/modules-plain 
2/dev/null ;; esac
-   case $i in (0|7|14)modprobe -i 
--set-version=$KERNEL_VERSION --show-depends sd_mod  /tmp/modules-plain 
2/dev/null ;; esac
-   case

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2012-01-14 Thread Tobias Powalowski 
Date: Saturday, January 14, 2012 @ 05:50:59
  Author: tpowa
Revision: 146611

upgpkg: hwdetect 2012.01-1

add fsck and shutdown options to HOOKS

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |6 +++---
 hwdetect |   11 +--
 2 files changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-14 08:51:04 UTC (rev 146610)
+++ PKGBUILD2012-01-14 10:50:59 UTC (rev 146611)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2011.08
-pkgrel=3
+pkgver=2012.01
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('771a88faf3e67fee2d38f125a8b27a2d')
+md5sums=('cdb979d7642145274bd1e57a8c4b9b83')

Modified: hwdetect
===
--- hwdetect2012-01-14 08:51:04 UTC (rev 146610)
+++ hwdetect2012-01-14 10:50:59 UTC (rev 146611)
@@ -51,6 +51,7 @@
echo --pcmcia   add pcmcia to HOOKS=
echo --nfs  add net to HOOKS=
echo --btrfsadd btrfs to HOOKS=
+   echo --shutdown add shutdown to HOOKS=
echo 
echo   For persistent sound and network files use:
echo --net  generate /tmp/network_persistent.rules
@@ -107,9 +108,12 @@
 # nfs switch
 [ $(echo $* | grep '\-nfs') ]  NFS=1
 
-# nfs switch
+# btrfs switch
 [ $(echo $* | grep '\-btrfs') ]  BTRFS=1
 
+# shutdown switch
+[ $(echo $* | grep '\-shutdown') ]  SHUTDOWN=1
+
 # hooks switch
 [ $(echo $* | grep '\-hooks') ]  HOOKS=1
 
@@ -507,7 +511,7 @@
if [ $HOOKS_DIR =  ]; then
HOOKS_DIR=/lib/initcpio/install
fi
-   START_HOOKS=base v86d udev keymap autodetect ide pata 
scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED btrfs filesystems
+   START_HOOKS=base v86d udev keymap fsck autodetect ide 
pata scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED btrfs filesystems 
shutdown
# remove the ones that don't exist on the system
for i in ${START_HOOKS}; do
if ! [ -e ${HOOKS_DIR}/$i ]; then 
@@ -547,6 +551,9 @@
if ! [ $BTRFS = 1 ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e 
s/btrfs//g)
fi
+   if ! [ $SHUTDOWN = 1 ]; then
+   START_HOOKS=$(echo $START_HOOKS | sed -e 
s/shutdown//g)
+   fi
echo HOOKS=\$START_HOOKS\ | sed -e 's/\ //g' -e 
's/\ //g' -e 's/\ \ /\ /g'
;;
--advanced) ADVANCED_ARCHBOOT=

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2011-08-08 Thread Tobias Powalowski 
Date: Monday, August 8, 2011 @ 10:59:55
  Author: tpowa
Revision: 134893

upgpkg: hwdetect 2011.08-2
check if asound/modules exist

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |5 ++---
 hwdetect |   10 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-08 13:44:56 UTC (rev 134892)
+++ PKGBUILD2011-08-08 14:59:55 UTC (rev 134893)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2011.08
-pkgrel=1
+pkgrel=2
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,5 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-
-md5sums=('afd06601a67896f49339456ec05a0d3c')
+md5sums=('813a91047ec871bc105e9f07776676d2')

Modified: hwdetect
===
--- hwdetect2011-08-08 13:44:56 UTC (rev 134892)
+++ hwdetect2011-08-08 14:59:55 UTC (rev 134893)
@@ -492,10 +492,12 @@
;;
--sound) : /tmp/sound_persistent.conf
 SOUND_EXPORTED=
-for i in $(cat /proc/asound/modules | cut -d ' ' -f 
3); do
-   SOUND_EXPORTED=$SOUND_EXPORTED $i
-done
-! [[ $SOUND_EXPORTED =  ]]  echo options snd 
slots=$(echo $SOUND_EXPORTED | sed -e 's# #,#g' -e 's#^,##g')  
/tmp/sound_persistent.conf
+if [ -e /proc/asound/modules ]; then
+   for i in $(cat /proc/asound/modules | cut -d ' 
' -f 3); do
+   SOUND_EXPORTED=$SOUND_EXPORTED $i
+   done
+   ! [[ $SOUND_EXPORTED =  ]]  echo options 
snd slots=$(echo $SOUND_EXPORTED | sed -e 's# #,#g' -e 's#^,##g')  
/tmp/sound_persistent.conf
+fi
 ;;
--modules) showlist2 MODULES \($(listmods modules/)\) | sed 
-e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 ;;

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2011-08-08 Thread Tobias Powalowski 
Date: Monday, August 8, 2011 @ 16:05:24
  Author: tpowa
Revision: 134903

upgpkg: hwdetect 2011.08-3
fix udev rule creation

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-08 19:39:31 UTC (rev 134902)
+++ PKGBUILD2011-08-08 20:05:24 UTC (rev 134903)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2011.08
-pkgrel=2
+pkgrel=3
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('813a91047ec871bc105e9f07776676d2')
+md5sums=('771a88faf3e67fee2d38f125a8b27a2d')

Modified: hwdetect
===
--- hwdetect2011-08-08 19:39:31 UTC (rev 134902)
+++ hwdetect2011-08-08 20:05:24 UTC (rev 134903)
@@ -486,7 +486,7 @@
;;
--net)  : /tmp/network_persistent.rules
for i in $(ls /sys/class/net/ | grep -v ^lo); do
- echo SUBSYSTEM==\net\, ATTR{address}=\$(cat 
/sys/class/net/${i}/address)\, NAME=\${i}\ /tmp/network_persistent.rules
+ echo SUBSYSTEM==\net\, ATTR{address}==\$(cat 
/sys/class/net/${i}/address)\, NAME=\${i}\ /tmp/network_persistent.rules
done
 
;;

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2011-08-07 Thread Tobias Powalowski 
Date: Sunday, August 7, 2011 @ 17:23:19
  Author: tpowa
Revision: 134845

upgpkg: hwdetect 2011.08-1
major cleanup in persistent sound and network code

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |5 +++--
 hwdetect |   27 ---
 2 files changed, 11 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-07 20:46:48 UTC (rev 134844)
+++ PKGBUILD2011-08-07 21:23:19 UTC (rev 134845)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2011.06
+pkgver=2011.08
 pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
@@ -16,4 +16,5 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('6ed80288fe8a76ae1827a552d40a6e8a')
+
+md5sums=('afd06601a67896f49339456ec05a0d3c')

Modified: hwdetect
===
--- hwdetect2011-08-07 20:46:48 UTC (rev 134844)
+++ hwdetect2011-08-07 21:23:19 UTC (rev 134845)
@@ -52,13 +52,12 @@
echo --nfs  add net to HOOKS=
echo --btrfsadd btrfs to HOOKS=
echo 
-   echo --net  generate /tmp/network_persistent.rules 
for udev use
+   echo   For persistent sound and network files use:
+   echo --net  generate /tmp/network_persistent.rules
+   echo --soundgenerate /tmp/sound_persistent.conf
echo 
-   echo   For /etc/rc.conf use:
-   echo --soundshow sound MODULES
echo --modules  show all detected MODULES
echo --modules-not-loaded   show all detected MODULES but not 
actually loaded
-   echo --blacklistactivates blacklisting for net and 
sound
echo 
exit 1
 }
@@ -114,9 +113,6 @@
 # hooks switch
 [ $(echo $* | grep '\-hooks') ]  HOOKS=1
 
-# blacklist switch
-[ $(echo $* | grep '\-blacklist') ]  BLACKLIST=1
-
 ADVANCED=
 # root device check
 if ! [ $ROOTDEVICE =  ]; then
@@ -494,19 +490,12 @@
done
 
;;
-   --sound) SOUND_EXPORTED=$(listmods pcspkr) $(listmods sound/)
-MODULES_EXPORTED=$MODULES_EXPORTED $SOUND_EXPORTED
-BLACKLIST_UDEV=
-for i in $SOUND_EXPORTED; do
-   BLACKLIST_UDEV=$BLACKLIST_UDEV $i
+   --sound) : /tmp/sound_persistent.conf
+SOUND_EXPORTED=
+for i in $(cat /proc/asound/modules | cut -d ' ' -f 
3); do
+   SOUND_EXPORTED=$SOUND_EXPORTED $i
 done
-showlist2 MODULES \($MODULES_EXPORTED\) | sed -e 
's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
- : /tmp/blacklist_sound.conf
-if [ $BLACKLIST = 1 ]; then
-   for i in $BLACKLIST_UDEV; do
-   echo blacklist $i  
/tmp/blacklist_sound.conf
-   done
- fi
+! [[ $SOUND_EXPORTED =  ]]  echo options snd 
slots=$(echo $SOUND_EXPORTED | sed -e 's# #,#g' -e 's#^,##g')  
/tmp/sound_persistent.conf
 ;;
--modules) showlist2 MODULES \($(listmods modules/)\) | sed 
-e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 ;;

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2011-06-11 Thread Tobias Powalowski 
Date: Saturday, June 11, 2011 @ 02:21:26
  Author: tpowa
Revision: 127132

upgpkg: hwdetect 2011.06-1
update to new blacklisting, cleanup some modules

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |4 +-
 hwdetect |   89 ++---
 2 files changed, 53 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-10 23:09:01 UTC (rev 127131)
+++ PKGBUILD2011-06-11 06:21:26 UTC (rev 127132)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2011.03
+pkgver=2011.06
 pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('3310641a9b9dbc9b828e7608c4e263aa')
+md5sums=('6ed80288fe8a76ae1827a552d40a6e8a')

Modified: hwdetect
===
--- hwdetect2011-06-10 23:09:01 UTC (rev 127131)
+++ hwdetect2011-06-11 06:21:26 UTC (rev 127132)
@@ -59,6 +59,7 @@
echo --usbhost  show usb hostcontroller MODULES
echo --modules  show all detected MODULES
echo --modules-not-loaded   show all detected MODULES but not 
actually loaded
+   echo --blacklistactivates blacklisting for net,sound 
and usbhost
echo 
exit 1
 }
@@ -117,6 +118,9 @@
 # vmware switch
 [ $(echo $* | grep '\-hooks') ]  HOOKS=1
 
+# blacklist switch
+[ $(echo $* | grep '\-blacklist') ]  BLACKLIST=1
+
 ADVANCED=
 # root device check
 if ! [ $ROOTDEVICE =  ]; then
@@ -257,11 +261,7 @@
[ $devid ] || continue

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_proc  /tmp/modules-plain  
2/dev/null
-   [ $devid = PNP0b00 ]  modprobe -i 
--set-version=$KERNEL_VERSION --show-depends rtc_sysfs  /tmp/modules-plain 
2/dev/null
-   [ $devid = PNP0b00 ]  modprobe -i 
--set-version=$KERNEL_VERSION --show-depends rtc_dev  /tmp/modules-plain 
2/dev/null
[ $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
@@ -292,14 +292,6 @@
modprobe -i --set-version=$KERNEL_VERSION --show-depends ppdev  
/tmp/modules-plain 2/dev/null
 fi
 
-# Sound OSS compat modules
-if [ $(grep 'snd-pcm' /tmp/modules-plain) ]; then
-   modprobe -i --set-version=$KERNEL_VERSION --show-depends snd-pcm-oss  
/tmp/modules-plain 2/dev/null
-fi
-if [ $(grep 'snd-seq' /tmp/modules-plain) ]; then
-   modprobe -i --set-version=$KERNEL_VERSION --show-depends snd-seq-oss  
/tmp/modules-plain 2/dev/null
-fi
-
 sort -u /tmp/modules-plain  /tmp/modules-stripped
 
 # OTHER modules loading first for speed up!
@@ -502,44 +494,65 @@
;;
--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 [ $(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=!8139cp
-   for i in $MODULES_EXPORTED; do
-   BLACKLIST_UDEV=$BLACKLIST_UDEV 
!$i
+   NET_EXPORTED=$(echo $(listmods 
drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods 
drivers/staging/) | sed -e 's/8139cp//g')
+   MODULES_EXPORTED=$MODULES_EXPORTED 
$NET_EXPORTED
+   BLACKLIST_UDEV=8139cp
+   for i in $NET_EXPORTED; do
+   BLACKLIST_UDEV=$BLACKLIST_UDEV 
$i
done
-   showlist2

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2011-03-27 Thread Tobias Powalowski 
Date: Sunday, March 27, 2011 @ 09:05:42
  Author: tpowa
Revision: 117001

upgpkg: hwdetect 2011.03-1
added usb 3.0 module and added modules-not-loaded option

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2011-03-27 12:26:46 UTC (rev 117000)
+++ PKGBUILD2011-03-27 13:05:42 UTC (rev 117001)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2010.08
+pkgver=2011.03
 pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('cece9e167bb240c82855ffc3f632a5bb')
+md5sums=('3310641a9b9dbc9b828e7608c4e263aa')

Modified: hwdetect
===
--- hwdetect2011-03-27 12:26:46 UTC (rev 117000)
+++ hwdetect2011-03-27 13:05:42 UTC (rev 117001)
@@ -1,6 +1,7 @@
 #! /bin/sh
 # Autodetection script for scanning /sys for hardware
 # for Archlinux by Tobias Powalowski tp...@archlinux.org
+# '--modules-not-loaded' patch by Grzegorz Wierzowiecki 
grzegorz.wierzowiecki_4t_pjwstk.edu.pl
 usage () {
echo $0 [options]
echo 
@@ -57,6 +58,7 @@
echo --soundshow sound MODULES
echo --usbhost  show usb hostcontroller MODULES
echo --modules  show all detected MODULES
+   echo --modules-not-loaded   show all detected MODULES but not 
actually loaded
echo 
exit 1
 }
@@ -380,6 +382,20 @@
echo 
 }
 
+showlist4() {
+   cat=$1 ; shift
+   [ $# -gt 0 ] || return
+   echo -n $cat=(\${MODULES[*]} 
+   lsmod  /tmp/modules-showlist4-$$
+   for i in $*; do
+   if ! grep -sq $(echo $i|tr - _) /tmp/modules-showlist4-$$ ; then
+   echo -n $i ;
+   fi
+   done
+   echo )
+   rm /tmp/modules-showlist4-$$
+}
+
 # starting different actions
 while [ $# -gt 0 ]; do
case $1 in
@@ -527,6 +543,8 @@
 ;;
--modules) showlist2 MODULES \($(listmods modules/)\) | sed 
-e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
 ;;
+   --modules-not-loaded) showlist4 MODULES $(listmods modules/) 
| sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
+;;
--hooks) 
if [ $HOOKS_DIR =  ]; then
HOOKS_DIR=/lib/initcpio/install

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-08-06 Thread Tobias Powalowski 
Date: Friday, August 6, 2010 @ 16:29:04
  Author: tpowa
Revision: 86895

upgpkg: hwdetect 2010.08-1
added nilfs2 support

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2010-08-06 20:25:25 UTC (rev 86894)
+++ PKGBUILD2010-08-06 20:29:04 UTC (rev 86895)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2010.07
+pkgver=2010.08
 pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('387058917c5d9ea898eaae060df9e18c')
+md5sums=('cece9e167bb240c82855ffc3f632a5bb')

Modified: hwdetect
===
--- hwdetect2010-08-06 20:25:25 UTC (rev 86894)
+++ hwdetect2010-08-06 20:29:04 UTC (rev 86895)
@@ -445,7 +445,7 @@
--show-staging) showlist STAGING $(listmods staging/) ;;
--show-video)  showlist VIDEO   $(listmods video/) ;;
--show-other)  showlist OTHER   $(listmods .ko agp/ acpi/ 
ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 
block/virtio virtio/virtio_pci ata/ usb/ ieee1394 net/ isdn/ input/ irda/ 
pcmcia/ sound/ video/ firewire/ hid/ staging/) ;;
-   --filesystem)   FILESYSTEM=ext2 ext3 ext4 btrfs reiserfs xfs 
jfs vfat
+   --filesystem)   FILESYSTEM=ext2 ext3 ext4 nilfs2 btrfs 
reiserfs xfs jfs vfat
for i in $FILESYSTEM; do
 [ $(grep $i /tmp/.blkid) ]  
FS=$FS $i
done

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-07-06 Thread Tobias Powalowski 
Date: Tuesday, July 6, 2010 @ 16:39:58
  Author: tpowa
Revision: 85010

upgpkg: hwdetect 2010.07-1
add btrfs support

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2010-07-06 17:43:36 UTC (rev 85009)
+++ PKGBUILD2010-07-06 20:39:58 UTC (rev 85010)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2010.06
-pkgrel=3
+pkgver=2010.07
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('12854d7a9f3e0347355e12a00b52cdb9')
+md5sums=('f33b954c2749c0ec4ce4dea94dc74da9')

Modified: hwdetect
===
--- hwdetect2010-07-06 17:43:36 UTC (rev 85009)
+++ hwdetect2010-07-06 20:39:58 UTC (rev 85010)
@@ -105,6 +105,9 @@
 # nfs switch
 [ $(echo $* | grep '\-nfs') ]  NFS=1
 
+# nfs switch
+[ $(echo $* | grep '\-btrfs') ]  BTRFS=1
+
 # vmware switch
 [ $(echo $* | grep '\-vmware') ]  VMWARE=1
 
@@ -527,7 +530,7 @@
if [ $HOOKS_DIR =  ]; then
HOOKS_DIR=/lib/initcpio/install
fi
-   START_HOOKS=base v86d udev keymap autodetect ide pata 
scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED filesystems
+   START_HOOKS=base v86d udev keymap autodetect ide pata 
scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED btrfs filesystems
# remove the ones that don't exist on the system
for i in ${START_HOOKS}; do
if ! [ -e ${HOOKS_DIR}/$i ]; then 
@@ -564,6 +567,9 @@
if ! [ $NFS = 1 ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e 
s/net//g)
fi
+   if ! [ $BTRFS = 1 ]; then
+   START_HOOKS=$(echo $START_HOOKS | sed -e 
s/btrfs//g)
+   fi
echo HOOKS=\$START_HOOKS\ | sed -e 's/\ //g' -e 
's/\ //g' -e 's/\ \ /\ /g'
;;
--advanced) ADVANCED_ARCHBOOT=

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-07-06 Thread Tobias Powalowski 
Date: Tuesday, July 6, 2010 @ 16:42:00
  Author: tpowa
Revision: 85013

upgpkg: hwdetect 2010.07-1
add btrfs support

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |2 +-
 hwdetect |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-06 20:40:28 UTC (rev 85012)
+++ PKGBUILD2010-07-06 20:42:00 UTC (rev 85013)
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('f33b954c2749c0ec4ce4dea94dc74da9')
+md5sums=('387058917c5d9ea898eaae060df9e18c')

Modified: hwdetect
===
--- hwdetect2010-07-06 20:40:28 UTC (rev 85012)
+++ hwdetect2010-07-06 20:42:00 UTC (rev 85013)
@@ -50,6 +50,7 @@
echo --fw   add fw to HOOKS=
echo --pcmcia   add pcmcia to HOOKS=
echo --nfs  add net to HOOKS=
+   echo --btrfsadd btrfs to HOOKS=
echo 
echo   For /etc/rc.conf use:
echo --net  show network MODULES

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-06-06 Thread Tobias Powalowski 
Date: Sunday, June 6, 2010 @ 11:19:12
  Author: tpowa
Revision: 81883

upgpkg: hwdetect 2010.06-2
more btrfs fixes

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2010-06-06 13:42:52 UTC (rev 81882)
+++ PKGBUILD2010-06-06 15:19:12 UTC (rev 81883)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2010.06
-pkgrel=1
+pkgrel=2
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -17,4 +17,4 @@
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
 
-md5sums=('6dd1834a651c9117866632ef8fb88c49')
+md5sums=('436b5fc458d26395c0c8c2317c8f8ef2')

Modified: hwdetect
===
--- hwdetect2010-06-06 13:42:52 UTC (rev 81882)
+++ hwdetect2010-06-06 15:19:12 UTC (rev 81883)
@@ -445,6 +445,7 @@
for i in $FILESYSTEM; do
 [ $(grep $i /tmp/.blkid) ]  
FS=$FS $i
done
+   [ $(grep btrfs $FS) ]  FS=$FS crc32c
MODULES_INITRAMFS=$MODULES_INITRAMFS $FS
showlist2 MODULES \$MODULES_INITRAMFS\ | 
sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g'
;;

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-06-06 Thread Tobias Powalowski 
Date: Sunday, June 6, 2010 @ 15:52:38
  Author: tpowa
Revision: 81889

upgpkg: hwdetect 2010.06-3
fix btrfs detection

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2010-06-06 18:00:27 UTC (rev 81888)
+++ PKGBUILD2010-06-06 19:52:38 UTC (rev 81889)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2010.06
-pkgrel=2
+pkgrel=3
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,5 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-
-md5sums=('436b5fc458d26395c0c8c2317c8f8ef2')
+md5sums=('12854d7a9f3e0347355e12a00b52cdb9')

Modified: hwdetect
===
--- hwdetect2010-06-06 18:00:27 UTC (rev 81888)
+++ hwdetect2010-06-06 19:52:38 UTC (rev 81889)
@@ -445,7 +445,7 @@
for i in $FILESYSTEM; do
 [ $(grep $i /tmp/.blkid) ]  
FS=$FS $i
done
-   [ $(grep btrfs $FS) ]  FS=$FS crc32c
+   [ $(echo $FS | grep btrfs) ]  FS=$FS 
crc32c
MODULES_INITRAMFS=$MODULES_INITRAMFS $FS
showlist2 MODULES \$MODULES_INITRAMFS\ | 
sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g'
;;

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-06-05 Thread Tobias Powalowski 
Date: Saturday, June 5, 2010 @ 06:53:23
  Author: tpowa
Revision: 81828

upgpkg: hwdetect 2010.06-1
add rudimentary btrfs detection

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2010-06-05 06:25:28 UTC (rev 81827)
+++ PKGBUILD2010-06-05 10:53:23 UTC (rev 81828)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2010.05
+pkgver=2010.06
 pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
@@ -16,4 +16,5 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('099e1ab04b8f2ffaa3493e0f36ba9198')
+
+md5sums=('6dd1834a651c9117866632ef8fb88c49')

Modified: hwdetect
===
--- hwdetect2010-06-05 06:25:28 UTC (rev 81827)
+++ hwdetect2010-06-05 10:53:23 UTC (rev 81828)
@@ -441,7 +441,7 @@
--show-staging) showlist STAGING $(listmods staging/) ;;
--show-video)  showlist VIDEO   $(listmods video/) ;;
--show-other)  showlist OTHER   $(listmods .ko agp/ acpi/ 
ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 
block/virtio virtio/virtio_pci ata/ usb/ ieee1394 net/ isdn/ input/ irda/ 
pcmcia/ sound/ video/ firewire/ hid/ staging/) ;;
-   --filesystem)   FILESYSTEM=ext2 ext3 ext4 reiserfs xfs jfs 
vfat
+   --filesystem)   FILESYSTEM=ext2 ext3 ext4 btrfs reiserfs xfs 
jfs vfat
for i in $FILESYSTEM; do
 [ $(grep $i /tmp/.blkid) ]  
FS=$FS $i
done

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-05-20 Thread Tobias Powalowski 
Date: Thursday, May 20, 2010 @ 16:54:13
  Author: tpowa
Revision: 80707

upgpkg: hwdetect 2010.05-1
fixed raid partition check

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2010-05-20 20:53:58 UTC (rev 80706)
+++ PKGBUILD2010-05-20 20:54:13 UTC (rev 80707)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2010.04
-pkgrel=2
+pkgver=2010.05
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('15ea80f186e30cce80378711b1f85e95')
+md5sums=('099e1ab04b8f2ffaa3493e0f36ba9198')

Modified: hwdetect
===
--- hwdetect2010-05-20 20:53:58 UTC (rev 80706)
+++ hwdetect2010-05-20 20:54:13 UTC (rev 80707)
@@ -167,7 +167,7 @@
if [ $(echo $ROOTDEVICE | grep /dev/md) ]; then
ADVANCED=mdadm
# raid partitions or raid?
-   if [ $(echo $ROOTDEVICE | grep /dev/md_d) ]; then
+   if [ $(echo $ROOTDEVICE | grep /dev/md*p) ]; then
realdevice=$(echo $ROOTDEVICE | sed -e 's#p.*##g' -e 
's#/dev/##g')
if ! [ $(find /sys/block/$realdevice/slaves/ -name 
'dm*' 2/dev/null) =  ]; then
SET_LVM=

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-04-16 Thread Tobias Powalowski 
Date: Friday, April 16, 2010 @ 03:03:11
  Author: tpowa
Revision: 77578

upgpkg: hwdetect 2010.04-1
fixed virtio module listing

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2010-04-15 23:50:05 UTC (rev 77577)
+++ PKGBUILD2010-04-16 07:03:11 UTC (rev 77578)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2010.02
-pkgrel=3
+pkgver=2010.04
+pkgrel=1
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,5 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-
-md5sums=('8481aa25d82f06464a63c493f66a2742')
+md5sums=('528a28d0fb02791617d3c1aaa2717811')

Modified: hwdetect
===
--- hwdetect2010-04-15 23:50:05 UTC (rev 77577)
+++ hwdetect2010-04-16 07:03:11 UTC (rev 77578)
@@ -298,7 +298,7 @@
 
 # OTHER modules loading first for speed up!
 grep -v ide/ /tmp/modules-stripped | grep -v scsi/ | grep -v fusion/ | 
grep -v block/sx8 | grep -v message/fusion | \
-   grep -v  block/cciss | grep -v block/cpqarray | grep -v 
block/DAC960 | grep -v ata/ | \
+   grep -v  block/cciss | grep -v block/cpqarray | grep -v 
block/DAC960 | grep -v block/virtio | grep -v ata/ | \
grep -v net/ | grep -v pcmcia/ | grep -v usb/ | \
grep -v firewire | grep -v ieee1394/ | grep -v usbhid/ | grep -v 
staging/ | grep -v wireless/  /tmp/modules-sorted
 # make a correct order for the modules, internal devices have priority!
@@ -437,7 +437,7 @@
showlist SOUND   $(listmods pcspkr) $(listmods sound/)
showlist STAGING $(listmods staging/)
showlist VIDEO   $(listmods video/)
-   showlist OTHER   $(listmods modules/ agp/ acpi/ ide/ 
scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 ata/ 
usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ video/ firewire/ hid/ 
staging/)
+   showlist OTHER   $(listmods modules/ agp/ acpi/ ide/ 
scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 
block/virtio ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ video/ 
firewire/ hid/ staging/)
;;
 
--show-modules-order)

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-04-16 Thread Tobias Powalowski 
Date: Friday, April 16, 2010 @ 04:38:55
  Author: tpowa
Revision: 77581

upgpkg: hwdetect 2010.04-2
more virtio fixes

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |4 ++--
 hwdetect |   44 
 2 files changed, 14 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-16 07:03:53 UTC (rev 77580)
+++ PKGBUILD2010-04-16 08:38:55 UTC (rev 77581)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2010.04
-pkgrel=1
+pkgrel=2
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('528a28d0fb02791617d3c1aaa2717811')
+md5sums=('15ea80f186e30cce80378711b1f85e95')

Modified: hwdetect
===
--- hwdetect2010-04-16 07:03:53 UTC (rev 77580)
+++ hwdetect2010-04-16 08:38:55 UTC (rev 77581)
@@ -300,7 +300,9 @@
 grep -v ide/ /tmp/modules-stripped | grep -v scsi/ | grep -v fusion/ | 
grep -v block/sx8 | grep -v message/fusion | \
grep -v  block/cciss | grep -v block/cpqarray | grep -v 
block/DAC960 | grep -v block/virtio | grep -v ata/ | \
grep -v net/ | grep -v pcmcia/ | grep -v usb/ | \
-   grep -v firewire | grep -v ieee1394/ | grep -v usbhid/ | grep -v 
staging/ | grep -v wireless/  /tmp/modules-sorted
+   grep -v firewire | grep -v ieee1394/ | grep -v usbhid/ | grep -v 
staging/ | grep -v wireless/ | grep -v virtio_pci  /tmp/modules-sorted
+# load virtio first!
+grep virtio_pci /tmp/modules-stripped   /tmp/modules-sorted
 # 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
@@ -308,8 +310,8 @@
 else
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
+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 virtio_blk | grep -v sx8 | 
grep -v nbd | grep -v pktcdvd | grep -v floppy  /tmp/modules-sorted
 grep fusion/ /tmp/modules-stripped  /tmp/modules-sorted
 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
@@ -326,7 +328,8 @@
 grep firewire/ /tmp/modules-stripped  /tmp/modules-sorted
 grep ieee1394/ /tmp/modules-stripped  /tmp/modules-sorted
 
-# add scsi device modules at the end
+# add scsi and virtio device modules at the end
+grep virtio_blk /tmp/modules-stripped  /tmp/modules-sorted
 grep sd_mod /tmp/modules-stripped  /tmp/modules-sorted
 grep sr_mod /tmp/modules-stripped  /tmp/modules-sorted
 grep /st.ko /tmp/modules-stripped  /tmp/modules-sorted
@@ -335,29 +338,6 @@
 
 sed -ne s#^insmod.*/\(.*\)\.ko.*#\1#p /tmp/modules-sorted  /tmp/moduleslist
 
-# blacklist framebuffer modules
-# not needed anymore since blacklist file!
-#for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*/*fb*); do
-#  BLACKLIST=$BLACKLIST $(basename $x .ko)
-#done
-#for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*fb*); do
-#  BLACKLIST=$BLACKLIST $(basename $x .ko)
-#done
-# delete modules that are blacklisted
-#BLACKLIST=${BLACKLIST} $(echo ${disablemodules} | sed 's|-|_|g' | sed 's|,| 
|g')
-#for i in $BLACKLIST; do
-#  [ $i ] || continue
-#  sed -i -e /^$i$/d /tmp/moduleslist
-#  # since '-' and '_' are interchangeable, we have to cover both
-#  if [ $(echo $i | grep '-') ]; then
-#  i=$(echo $i | sed 's|-|_|g')
-#  sed -i -e /^$i$/d /tmp/moduleslist
-#  elif [ $(echo $i | grep '_') ]; then
-#  i=$(echo $i | sed 's|_|-|g')
-#  sed -i -e /^$i$/d /tmp/moduleslist
-#  fi
-#done
-
 listmods() {
key=$1 ; shift
ex=
@@ -425,7 +405,7 @@
showlist ACPI$(listmods acpi/)
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 SCSI$(listmods virtio/virtio_pci) 
$(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd 
pktcdvd sx8 floppy)
showlist SATA$(listmods ata/ pata

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-02-10 Thread Tobias Powalowski 
Date: Thursday, February 11, 2010 @ 02:59:19
  Author: tpowa
Revision: 68161

upgpkg: hwdetect 2010.02-3
fixed various output things

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |5 +++--
 hwdetect |   12 +---
 2 files changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-11 07:08:56 UTC (rev 68160)
+++ PKGBUILD2010-02-11 07:59:19 UTC (rev 68161)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2010.02
-pkgrel=2
+pkgrel=3
 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / 
rc.conf support
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,4 +16,5 @@
 build() {
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
 }
-md5sums=('37c57d0158761b5ece8fdc341cdcce43')
+
+md5sums=('8481aa25d82f06464a63c493f66a2742')

Modified: hwdetect
===
--- hwdetect2010-02-11 07:08:56 UTC (rev 68160)
+++ hwdetect2010-02-11 07:59:19 UTC (rev 68161)
@@ -108,6 +108,9 @@
 # vmware switch
 [ $(echo $* | grep '\-vmware') ]  VMWARE=1
 
+# vmware switch
+[ $(echo $* | grep '\-hooks') ]  HOOKS=1
+
 ADVANCED=
 # root device check
 if ! [ $ROOTDEVICE =  ]; then
@@ -483,15 +486,18 @@
;;
--uvesafb)  FB=uvesafb
MODULES_INITRAMFS=$FB $MODULES_INITRAMFS
-   showlist2 MODULES \$MODULES_INITRAMFS\ | 
sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g'
+   ! [ $HOOKS = 1 ]  showlist2 MODULES 
\$MODULES_INITRAMFS\ | sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 
's/\ \ /\ /g'
;;
--fbmodule) FB=
for i in $(cat 
/etc/modprobe.d/framebuffer_blacklist.conf); do
i=$(echo $i | sed -e 's/blacklist //g')
-cat /proc/modules | grep -q ^$i  FB=$i
+   # check if already in FB array, to avoid 
double entries
+   if [ $(cat /proc/modules | grep ^$i) ]; 
then
+   ! [ $(grep -w $FB) ]  FB=$i
+   fi
 done
MODULES_INITRAMFS=$FB $MODULES_INITRAMFS 
-   showlist2 MODULES \$MODULES_INITRAMFS\ | 
sed -e 's/(\  /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g'
+   ! [ $HOOKS = 1 ]  showlist2 MODULES 
\$MODULES_INITRAMFS\ | sed -e 's/(\  /(/g' -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 [ $(dmesg | grep 'use 8139too') ]; then

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2010-02-08 Thread Tobias Powalowski 
Date: Monday, February 8, 2010 @ 17:11:26
  Author: tpowa
Revision: 67612

upgpkg: hwdetect 2010.02-2
fix syntax of new blkid and sys layout

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

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

Modified: PKGBUILD
===
--- PKGBUILD2010-02-08 20:13:45 UTC (rev 67611)
+++ PKGBUILD2010-02-08 22:11:26 UTC (rev 67612)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
 pkgver=2010.02
-pkgrel=1
+pkgrel=2
 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=('1c4dd29f64645dd7e464b71f1778ba8f')
+md5sums=('37c57d0158761b5ece8fdc341cdcce43')

Modified: hwdetect
===
--- hwdetect2010-02-08 20:13:45 UTC (rev 67611)
+++ hwdetect2010-02-08 22:11:26 UTC (rev 67612)
@@ -129,7 +129,7 @@
ADVANCED=mdadm encrypt
realdevice=$(cryptsetup status $ROOTDEVICE 
2/dev/null | grep device:.*/dev/md | sed -e 's#.*\ ##g')
# check on lvm
-   [ $(mdadm --detail $realdevice | grep 
/dev/block/254) ]  ADVANCED=lvm2 mdadm encrypt
+   [ $(mdadm --detail $realdevice | grep 
/dev/dm-) ]  ADVANCED=lvm2 mdadm encrypt
fi
fi
# check if lvm is used
@@ -137,25 +137,25 @@
ADVANCED=lvm2
vg=$(echo $(lvs -o vg_name --noheading $ROOTDEVICE))
# check on encrypt
-   if [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/block/254) ]; then 
+   if [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/dm-) ]; then 
ADVANCED=encrypt lvm2
# check on raid
[ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]  ADVANCED=mdadm encrypt lvm2
-   for i in $(pvs -o pv_name,vg_name --noheading 
| grep $vg$ | grep /dev/block/254); do
+   for i in $(pvs -o pv_name,vg_name --noheading 
| grep $vg$ | grep /dev/dm-); do
realdevice=$(echo $i | cut -d ' ' -f1)
-   getsymlink=$(readlink $realdevice)
-   correctdevice=$(echo $getsymlink | sed 
-e 's#\.\.#/dev#g')
-   [ $(cryptsetup status $correctdevice 
2/dev/null | grep device:.*/dev/md) ]  ADVANCED=mdadm encrypt lvm2
+   #getsymlink=$(readlink $realdevice)
+   #correctdevice=$(echo $getsymlink | 
sed -e 's#\.\.#/dev#g')
+   [ $(cryptsetup status $realdevice 
2/dev/null | grep device:.*/dev/md) ]  ADVANCED=mdadm encrypt lvm2
done
fi
# check on raid
if [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/md) ]; then
ADVANCED=mdadm lvm2
#check on encrypt
-   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/block/254) ]  ADVANCED=encrypt mdadm lvm2
+   [ $(pvs -o pv_name,vg_name --noheading | grep 
$vg$ | grep /dev/dm-) ]  ADVANCED=encrypt mdadm lvm2
for i in $(pvs -o pv_name,vg_name --noheading 
| grep $vg$ | grep /dev/md); do
realdevice=$(echo $i | cut -d ' ' -f1)
-   [ $(mdadm --detail $realdevice | grep 
/dev/block/254) ]  ADVANCED=encrypt mdadm lvm2
+   [ $(mdadm --detail $realdevice | grep 
/dev/dm-) ]  ADVANCED=encrypt mdadm lvm2
done
fi
fi
@@ -166,10 +166,10 @@
# raid partitions or raid?
if [ $(echo $ROOTDEVICE | grep /dev/md_d) ]; then
realdevice=$(echo $ROOTDEVICE | sed -e 's#p.*##g' -e 
's#/dev/##g')
-   if ! [ $(find /sys/block/$realdevice/ -name 'dm*' 
2/dev/null) =  ]; then
+   if ! [ $(find /sys/block/$realdevice/slaves/ -name 
'dm*' 2/dev/null) =  ]; then
SET_LVM=
SET_ENCRYPT=
-   for k in $(find

[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

2009-12-06 Thread Tobias Powalowski 
Date: Sunday, December 6, 2009 @ 16:45:41
  Author: tpowa
Revision: 60759

upgpkg: hwdetect 2009.12-1
added framebuffer additions

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

--+
 PKGBUILD |6 ++--
 hwdetect |   74 +++--
 2 files changed, 61 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-06 21:05:46 UTC (rev 60758)
+++ PKGBUILD2009-12-06 21:45:41 UTC (rev 60759)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 pkgname=hwdetect
-pkgver=2009.09
-pkgrel=5
+pkgver=2009.12
+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=('559ed19d4bdfca0d224192717638a566')
+md5sums=('a1bcd8e9b47b7cbfbb3b936af75ab960')

Modified: hwdetect
===
--- hwdetect2009-12-06 21:05:46 UTC (rev 60758)
+++ hwdetect2009-12-06 21:45:41 UTC (rev 60759)
@@ -35,6 +35,9 @@
echo --filesystem   add filesystems to MODULES=
echo --hostcontroller   show MODULES= for all hostcontrollers
echo --vmware   add BusLogic to MODULES for vmware
+   echo --ati-kms  add ati kernel mode setting 
+   echo --intel-kmsadd intel kernel mode setting
+   echo --nvidia-kms   add nvidia kernel mode setting
 echo  
echo --rootdevice=  autodetected advanced features of 
rootdevice
echo --hooks-dir=   use this directory for HOOKS check
@@ -78,6 +81,9 @@
 # IDE/PATA switch
 [ $(echo $* | grep '\-ide-legacy') ]  IDE_LEGACY=1
 
+# uvesafb switch
+[ $(echo $* | grep '\-uvesafb') ]  UVESAFB=1
+
 # dmraid switch
 [ $(echo $* | grep '\-dmraid') ]  DMRAID=1
 
@@ -259,10 +265,10 @@
 # SCSI disks/cdroms/tapes/generic devices
 if [ $(find /sys/devices -noleaf -name 'type') ]; then
for i in $(cat $(find /sys/devices -noleaf -name type)); do
-   case $i in (4|5)   modprobe -i 
--set-version=$KERNEL_VERSION --show-depends sr-mod  /tmp/modules-plain 
2/dev/null ;; esac
+   case $i in (4|5)   modprobe -i 
--set-version=$KERNEL_VERSION --show-depends sr_mod  /tmp/modules-plain 
2/dev/null ;; esac
case $i in (2|3|6|8|9) modprobe -i 
--set-version=$KERNEL_VERSION --show-depends sg  /tmp/modules-plain 
2/dev/null ;; esac
-   case $i in (0|7|14)  modprobe -i 
--set-version=$KERNEL_VERSION --show-depends sd-mod  /tmp/modules-plain 
2/dev/null ;; esac
-   case $i in (1)   modprobe -i 
--set-version=$KERNEL_VERSION --show-depends st  /tmp/modules-plain 
2/dev/null ;; esac
+   case $i in (0|7|14)modprobe -i 
--set-version=$KERNEL_VERSION --show-depends sd_mod  /tmp/modules-plain 
2/dev/null ;; esac
+   case $i in (1) modprobe -i 
--set-version=$KERNEL_VERSION --show-depends st  /tmp/modules-plain 
2/dev/null ;; esac
done
 fi
 
@@ -327,12 +333,13 @@
 sed -ne s#^insmod.*/\(.*\)\.ko.*#\1#p /tmp/modules-sorted  /tmp/moduleslist
 
 # blacklist framebuffer modules
-for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*/*fb*); do
-   BLACKLIST=$BLACKLIST $(basename $x .ko)
-done
-for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*fb*); do
-   BLACKLIST=$BLACKLIST $(basename $x .ko)
-done
+# not needed anymore since blacklist file!
+#for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*/*fb*); do
+#  BLACKLIST=$BLACKLIST $(basename $x .ko)
+#done
+#for x in $(echo /lib/modules/$(uname -r)/kernel/drivers/video/*fb*); do
+#  BLACKLIST=$BLACKLIST $(basename $x .ko)
+#done
 # delete modules that are blacklisted
 BLACKLIST=${BLACKLIST} $(echo ${disablemodules} | sed 's|-|_|g' | sed 's|,| 
|g')
 for i in $BLACKLIST; do
@@ -447,13 +454,41 @@
--show-staging) showlist STAGING $(listmods staging/) ;;
--show-video)  showlist VIDEO   $(listmods video/) ;;
--show-other)  showlist OTHER   $(listmods .ko agp/ acpi/ 
ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 
ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ video/ firewire/ hid/ 
staging/) ;;
-   --filesystem) FILESYSTEM=ext2 ext3 ext4 reiserfs xfs jfs
- for i in $FILESYSTEM; do
+   --filesystem)   FILESYSTEM=ext2 ext3 ext4 reiserfs xfs jfs 
vfat
+   for i in $FILESYSTEM; do
 [ $(grep $i /tmp/.blkid) ]  
FS=$FS $i
- done
- ;;
-   --hostcontroller)