summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/udev
diff options
context:
space:
mode:
authorGreg Frost <gregfrost1@bigpond.com>2009-07-03 23:22:55 (GMT)
committerGreg Frost <gregfrost1@bigpond.com>2009-07-03 23:22:55 (GMT)
commit21f912004613ab41436b36b424f943f3c5bfbf83 (patch)
treeb1649208720b89cbbf0d60f0c8f3a6d70bc459d8 /abs/core-testing/udev
parentcdcc1aaa40d3cc1a6da6ac919ca651c011fe104e (diff)
downloadlinhes_pkgbuild-21f912004613ab41436b36b424f943f3c5bfbf83.zip
linhes_pkgbuild-21f912004613ab41436b36b424f943f3c5bfbf83.tar.gz
linhes_pkgbuild-21f912004613ab41436b36b424f943f3c5bfbf83.tar.bz2
udev&mdadm: resolve conflict
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 \