[arch-commits] Commit in (3 files)

[Thomas Bächler]

    Date: Thursday, November 5, 2009 @ 18:54:13
  Author: thomas
Revision: 58211

Move to upstream udev rules for device-mapper. This requires changes to initscripts to set the STARTUP environment variable during udev trigger.

Modified:
  lvm2/trunk/PKGBUILD
  udev/trunk/PKGBUILD
  udev/trunk/arch-udev-rules.patch

----------------------------------+
 lvm2/trunk/PKGBUILD              |   36 +++++++++++++++++++++++++-----------
 udev/trunk/PKGBUILD              |    4 ++--
 udev/trunk/arch-udev-rules.patch |   12 ------------
 3 files changed, 27 insertions(+), 25 deletions(-)

Modified: lvm2/trunk/PKGBUILD
===================================================================
--- lvm2/trunk/PKGBUILD	2009-11-05 23:53:41 UTC (rev 58210)
+++ lvm2/trunk/PKGBUILD	2009-11-05 23:54:13 UTC (rev 58211)
@@ -6,23 +6,31 @@
 pkgver=2.02.54
 _pkgverdm=1.02.39
 _pkgverlvm=${pkgver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL')
 groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz \
-        lvm2_install lvm2_hook device-mapper.rules)
-md5sums=('6a33416469652b01aa48cefbe9cac8c1' '40dccdb1044f00fc1e29ca549933d4bd'\
-         'd6f3ca901747c386aa0d842e9ea64413' '065f32a36947e6183722ed9aef13dc0c')
-sha1sums=('794fd5078f7f96eeb1ff1b9ddc47e37a13e8a75d' '86358b3360373dcd1d7e1bf009fe6e6d0c70cdc3'\
-         '0c2a367f2217e6363e5e80257cbc7730d3841e42' '003f5cf654503dcc9c1ba7c11c7d6e77bf27bb8d')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
+        lvm2_install
+        lvm2_hook
+        dm-rules-remove-last_rule.patch)
+md5sums=('6a33416469652b01aa48cefbe9cac8c1'
+         '40dccdb1044f00fc1e29ca549933d4bd'
+         'd6f3ca901747c386aa0d842e9ea64413'
+         'ffd137d13f7683dc3f60004c8d2f9ced')
+sha1sums=('794fd5078f7f96eeb1ff1b9ddc47e37a13e8a75d'
+          '86358b3360373dcd1d7e1bf009fe6e6d0c70cdc3'
+          '0c2a367f2217e6363e5e80257cbc7730d3841e42'
+          '0af2a71ae2593cf312e7c4b07593d566d61a4c60')
 
 build() {
   cd "${srcdir}/LVM2.${_pkgverlvm}"
+  patch -p1 -i "${srcdir}/dm-rules-remove-last_rule.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-readline \
     --enable-pkgconfig --enable-static_link --with-staticdir=/sbin \
-    --enable-dmeventd --enable-cmdlib || return 1
+    --enable-dmeventd --enable-cmdlib \
+    --with-udevdir=/lib/udev/rules.d/ || return 1
   make || return 1
 }
 
@@ -39,8 +47,10 @@
   install -D -m644 libdm/ioctl/libdevmapper.a "${pkgdir}/usr/lib/libdevmapper.a" || return 1
   rm "${pkgdir}"/lib/libdevmapper-event.a*
   install -D -m644 daemons/dmeventd/libdevmapper-event.a "${pkgdir}/usr/lib/libdevmapper-event.a" || return 1
-  # install udev rule
-  install -D -m644 "${srcdir}/device-mapper.rules" "${pkgdir}/lib/udev/rules.d/device-mapper.rules" || return 1
+  # install udev rules
+  cd udev
+  make DESTDIR="${pkgdir}" install_device-mapper || return 1
+  cd ..
   # fix device-mapper link bug
   ln -sf /lib/libdevmapper.so "${pkgdir}/usr/lib/libdevmapper.so" || return 1
 }
@@ -57,7 +67,11 @@
   rm "${pkgdir}"/usr/lib/liblvm2cmd.a*
   install -D -m644 tools/liblvm2cmd.a "${pkgdir}/usr/lib/liblvm2cmd.a" || return 1
   install -d "${pkgdir}"/etc/lvm/{archive,backup} || return 1
-  # add hook
+  # install udev rules
+  cd udev
+  make DESTDIR="${pkgdir}" install_lvm2 || return 1
+  cd ..
+  # mkinitcpio hook
   install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" || return 1
   install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" || return 1
 }

Modified: udev/trunk/PKGBUILD
===================================================================
--- udev/trunk/PKGBUILD	2009-11-05 23:53:41 UTC (rev 58210)
+++ udev/trunk/PKGBUILD	2009-11-05 23:54:13 UTC (rev 58211)
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
 pkgver=146
-pkgrel=2
+pkgrel=3
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -28,7 +28,7 @@
          '64a0169dc9d883a63ff9f8f491fdc34a'
          '2e808ee78d237c478b57af2a68d43769'
          '2d6dc6842464f107bccc68cd505a6c31'
-         '9be4683c480488926fdf92a34ae5963c'
+         '24207d84eae19d4f08422b89ce6c55c5'
          '35fa97500243a79b2370fa4684828e69'
          '8cd53a3d91d2321a646033dc18f29217')
 

Modified: udev/trunk/arch-udev-rules.patch
===================================================================
--- udev/trunk/arch-udev-rules.patch	2009-11-05 23:53:41 UTC (rev 58210)
+++ udev/trunk/arch-udev-rules.patch	2009-11-05 23:54:13 UTC (rev 58211)
@@ -39,18 +39,6 @@
 -ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
 -ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"
 +ACTION=="remove", PROGRAM="ignore-remove.sh %r", OPTIONS+="ignore_remove"
-diff -Nur rules.d/60-persistent-storage.rules rules.d.arch/60-persistent-storage.rules
---- rules.d/60-persistent-storage.rules	2009-03-07 22:22:48.200242883 +0100
-+++ rules.d.arch/60-persistent-storage.rules	2009-03-07 22:22:54.757744454 +0100
-@@ -10,7 +10,7 @@
- SUBSYSTEM!="block", GOTO="persistent_storage_end"
- 
- # skip rules for inappropriate block devices
--KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end"
-+KERNEL=="fd*|mtd*|nbd*|gnbd*|md*|btibm*", GOTO="persistent_storage_end"
- 
- # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
- KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end"
 diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
 --- rules.d/80-drivers.rules	2009-03-07 22:22:48.200242883 +0100
 +++ rules.d.arch/80-drivers.rules	2009-03-07 22:22:54.757744454 +0100