summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/udev
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-07-04 23:05:09 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-07-04 23:05:09 (GMT)
commit879da47e831fa0c5dc443f1059717af8184cb6d8 (patch)
tree08892860acda11a7594788c8687ec960dac4b68d /abs/core-testing/udev
parent19e8f207678d02f9a912aa0728b90a4c63d82c82 (diff)
parent21f912004613ab41436b36b424f943f3c5bfbf83 (diff)
downloadlinhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.zip
linhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.tar.gz
linhes_pkgbuild-879da47e831fa0c5dc443f1059717af8184cb6d8.tar.bz2
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Conflicts: abs/core-testing/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core-testing/udev')
-rw-r--r--abs/core-testing/udev/PKGBUILD5
1 files changed, 4 insertions, 1 deletions
diff --git a/abs/core-testing/udev/PKGBUILD b/abs/core-testing/udev/PKGBUILD
index 15c514c..18b1763 100644
--- a/abs/core-testing/udev/PKGBUILD
+++ b/abs/core-testing/udev/PKGBUILD
@@ -4,7 +4,7 @@
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=udev
pkgver=135
-pkgrel=3
+pkgrel=4
pkgdesc="The userspace dev tools (udev)"
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -75,6 +75,9 @@ build() {
cd $pkgdir/lib/udev/rules.d/
patch -Np1 -i $srcdir/arch-udev-rules.patch || return 1
+ # remove the md-raid rules which are now provided by the mdadm package
+ rm -f $pkgdir/lib/udev/rules.d/64-md-raid.rules
+
# disable persistent cdromsymlinks and network by default
# and move it to /etc/udev/rules.d
mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \