[arch-commits] Commit in hwdetect/repos (6 files)
Tobias Powalowski
tpowa at archlinux.org
Sat Mar 28 13:22:21 UTC 2009
Date: Saturday, March 28, 2009 @ 09:22:21
Author: tpowa
Revision: 31813
Merged revisions 31808 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/hwdetect/trunk
........
r31808 | tpowa | 2009-03-28 13:21:17 +0000 (Sa, 28 M?\195?\164r 2009) | 1 line
upgpkg: hwdetect 2009.03-1
........
Modified:
hwdetect/repos/extra-i686/ (properties)
hwdetect/repos/extra-i686/PKGBUILD
hwdetect/repos/extra-i686/hwdetect
hwdetect/repos/extra-x86_64/ (properties)
hwdetect/repos/extra-x86_64/PKGBUILD
hwdetect/repos/extra-x86_64/hwdetect
-----------------------+
extra-i686/PKGBUILD | 4 ++--
extra-i686/hwdetect | 19 ++++++-------------
extra-x86_64/PKGBUILD | 4 ++--
extra-x86_64/hwdetect | 19 ++++++-------------
4 files changed, 16 insertions(+), 30 deletions(-)
Property changes on: hwdetect/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /hwdetect/trunk:1-25704
+ /hwdetect/trunk:1-31810
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-03-28 13:22:07 UTC (rev 31812)
+++ extra-i686/PKGBUILD 2009-03-28 13:22:21 UTC (rev 31813)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=hwdetect
-pkgver=2009.01
+pkgver=2009.03
pkgrel=1
pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
arch=(i686 x86_64)
@@ -12,4 +12,4 @@
build() {
install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
}
-md5sums=('9552b26b66f7b90d2d12f7d324007961')
+md5sums=('76658017051a668aeb0b46e30e4dbc73')
Modified: extra-i686/hwdetect
===================================================================
--- extra-i686/hwdetect 2009-03-28 13:22:07 UTC (rev 31812)
+++ extra-i686/hwdetect 2009-03-28 13:22:21 UTC (rev 31813)
@@ -38,8 +38,7 @@
echo " --hooks show HOOKS="
echo " --hooks-dir use this directory for HOOKS check"
echo " --dsdt add dsdt to HOOKS="
- echo " --raid add raid to HOOKS="
- echo " --raid-partitions add raid-partitions to HOOKS="
+ echo " --mdadm add mdadm to HOOKS="
echo " --dmraid add dmraid to HOOKS="
echo " --encrypt add encrypt to HOOKS="
echo " --lvm2 add lvm2 to HOOKS="
@@ -80,11 +79,8 @@
# dsdt switch
[ "$(echo $* | grep '\-dsdt')" ] && DSDT=1
-# raid switch
-[ "$(echo $* | grep '\-raid-partition')" ] && RAID_PARTITIONS=1
-if ! [ "$RAID_PARTITIONS" = "1" ]; then
- [ "$(echo $* | grep '\-raid')" ] && RAID=1
-fi
+# mdadm switch
+[ "$(echo $* | grep '\-mdadm')" ] && MDADM=1
# dmraid switch
[ "$(echo $* | grep '\-dmraid')" ] && DMRAID=1
@@ -391,7 +387,7 @@
if [ "$HOOKS_DIR" = "" ]; then
HOOKS_DIR="/lib/initcpio/install"
fi
- START_HOOKS="base udev dsdt autodetect ide pata scsi sata usb fw pcmcia net raid raid-partitions dmraid usbinput keymap encrypt lvm2 filesystems"
+ START_HOOKS="base udev dsdt autodetect ide pata scsi sata usb fw pcmcia net dmraid mdadm usbinput keymap encrypt lvm2 filesystems"
# remove the ones that don't exist on the system
for i in ${START_HOOKS}; do
if ! [ -e "${HOOKS_DIR}/$i" ]; then
@@ -410,12 +406,9 @@
if ! [ "$KEYMAP" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/keymap//g")
fi
- if ! [ "$RAID" = "1" ]; then
- START_HOOKS=$(echo $START_HOOKS | sed -e "s/\ raid\ //g")
+ if ! [ "$MDADM" = "1" ]; then
+ START_HOOKS=$(echo $START_HOOKS | sed -e "s/\ mdadm\ //g")
fi
- if ! [ "$RAID_PARTITIONS" = "1" ]; then
- START_HOOKS=$(echo $START_HOOKS | sed -e "s/raid-partitions\ //g")
- fi
if ! [ "$DMRAID" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/dmraid//g")
fi
Property changes on: hwdetect/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /hwdetect/trunk:1-25702
+ /hwdetect/trunk:1-31809
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-03-28 13:22:07 UTC (rev 31812)
+++ extra-x86_64/PKGBUILD 2009-03-28 13:22:21 UTC (rev 31813)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=hwdetect
-pkgver=2009.01
+pkgver=2009.03
pkgrel=1
pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
arch=(i686 x86_64)
@@ -12,4 +12,4 @@
build() {
install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
}
-md5sums=('9552b26b66f7b90d2d12f7d324007961')
+md5sums=('76658017051a668aeb0b46e30e4dbc73')
Modified: extra-x86_64/hwdetect
===================================================================
--- extra-x86_64/hwdetect 2009-03-28 13:22:07 UTC (rev 31812)
+++ extra-x86_64/hwdetect 2009-03-28 13:22:21 UTC (rev 31813)
@@ -38,8 +38,7 @@
echo " --hooks show HOOKS="
echo " --hooks-dir use this directory for HOOKS check"
echo " --dsdt add dsdt to HOOKS="
- echo " --raid add raid to HOOKS="
- echo " --raid-partitions add raid-partitions to HOOKS="
+ echo " --mdadm add mdadm to HOOKS="
echo " --dmraid add dmraid to HOOKS="
echo " --encrypt add encrypt to HOOKS="
echo " --lvm2 add lvm2 to HOOKS="
@@ -80,11 +79,8 @@
# dsdt switch
[ "$(echo $* | grep '\-dsdt')" ] && DSDT=1
-# raid switch
-[ "$(echo $* | grep '\-raid-partition')" ] && RAID_PARTITIONS=1
-if ! [ "$RAID_PARTITIONS" = "1" ]; then
- [ "$(echo $* | grep '\-raid')" ] && RAID=1
-fi
+# mdadm switch
+[ "$(echo $* | grep '\-mdadm')" ] && MDADM=1
# dmraid switch
[ "$(echo $* | grep '\-dmraid')" ] && DMRAID=1
@@ -391,7 +387,7 @@
if [ "$HOOKS_DIR" = "" ]; then
HOOKS_DIR="/lib/initcpio/install"
fi
- START_HOOKS="base udev dsdt autodetect ide pata scsi sata usb fw pcmcia net raid raid-partitions dmraid usbinput keymap encrypt lvm2 filesystems"
+ START_HOOKS="base udev dsdt autodetect ide pata scsi sata usb fw pcmcia net dmraid mdadm usbinput keymap encrypt lvm2 filesystems"
# remove the ones that don't exist on the system
for i in ${START_HOOKS}; do
if ! [ -e "${HOOKS_DIR}/$i" ]; then
@@ -410,12 +406,9 @@
if ! [ "$KEYMAP" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/keymap//g")
fi
- if ! [ "$RAID" = "1" ]; then
- START_HOOKS=$(echo $START_HOOKS | sed -e "s/\ raid\ //g")
+ if ! [ "$MDADM" = "1" ]; then
+ START_HOOKS=$(echo $START_HOOKS | sed -e "s/\ mdadm\ //g")
fi
- if ! [ "$RAID_PARTITIONS" = "1" ]; then
- START_HOOKS=$(echo $START_HOOKS | sed -e "s/raid-partitions\ //g")
- fi
if ! [ "$DMRAID" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/dmraid//g")
fi
More information about the arch-commits
mailing list