[arch-commits] Commit in lvm2/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Wednesday, September 23, 2015 @ 23:37:45
  Author: bpiotrowski
Revision: 247181

upgpkg: lvm2 2.02.132-1

new upstream release

Modified:
  lvm2/trunk/PKGBUILD
Deleted:
  lvm2/trunk/0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch

--------------------------------------------------+
 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch |   28 ---------------------
 PKGBUILD                                         |   12 +++------
 2 files changed, 4 insertions(+), 36 deletions(-)

Deleted: 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch
===================================================================
--- 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch	2015-09-23 21:32:46 UTC (rev 247180)
+++ 0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch	2015-09-23 21:37:45 UTC (rev 247181)
@@ -1,28 +0,0 @@
-From 3ea396e9d220cec55fd4e139be7ae486cb4ddb91 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas at archlinux.org>
-Date: Wed, 12 Aug 2015 09:29:04 +0200
-Subject: [PATCH] udev: use += for SYSTEMD_WANTS instead of =
-
-Instead of using = to override SYSTEMD_WANTS, use += to add
-the pvscan service.
----
- WHATS_NEW        | 1 +
- udev/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/udev/Makefile.in b/udev/Makefile.in
-index 390069b..c4cc2bd 100644
---- a/udev/Makefile.in
-+++ b/udev/Makefile.in
-@@ -47,7 +47,7 @@ BLKID_RULE=IMPORT{program}=\"${SBIN}\/blkid -o udev -p \$$tempnode\"
- endif
- 
- ifeq ("@UDEV_SYSTEMD_BACKGROUND_JOBS@", "yes")
--PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}=\"lvm2-pvscan@\$$major:\$$minor.service\"
-+PVSCAN_RULE=ACTION\!=\"remove\", ENV{LVM_PV_GONE}==\"1\", RUN\+=\"@bindir@/systemd-run $(LVM_EXEC)\/lvm pvscan --cache \$$major\:\$$minor\", GOTO=\"lvm_end\"\nENV{SYSTEMD_ALIAS}=\"\/dev\/block\/\$$major:\$$minor\"\nENV{ID_MODEL}=\"LVM PV \$$env{ID_FS_UUID_ENC} on \/dev\/\$$name\"\nENV{SYSTEMD_WANTS}\+=\"lvm2-pvscan@\$$major:\$$minor.service\"
- else
- PVSCAN_RULE=RUN\+\=\"$(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major \$$major --minor \$$minor\", ENV{LVM_SCANNED}=\"1\"
- endif
--- 
-2.5.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-23 21:32:46 UTC (rev 247180)
+++ PKGBUILD	2015-09-23 21:37:45 UTC (rev 247181)
@@ -4,7 +4,7 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.127
+pkgver=2.02.132
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
@@ -16,16 +16,14 @@
         lvm2_hook
         sd-lvm2_install
         11-dm-initramfs.rules
-        lvm2-make-sockets-static.patch
-        0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch)
-sha1sums=('e6a4184be7c2a22725e647de131663637023e895'
+        lvm2-make-sockets-static.patch)
+sha1sums=('45a486e2aba07fa50fd663d0c550ba9a136aead2'
           'SKIP'
           '40ef991650555b904e73bcc3f344d736722e27ca'
           'ff0fdf0a3005a41acd4b36865056109effc3474b'
           '86c18852409dc03f38bdd734ac3e7b54bed9c4ce'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'b084512af42f2e16cdccd8b7ee4de27b574d1f94'
-          '8cbab7e869f0f0949ae9a3104cafb76b77de52c4')
+          'b084512af42f2e16cdccd8b7ee4de27b574d1f94')
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17')
 
 prepare() {
@@ -36,8 +34,6 @@
 
   # make systemd sockets static
   patch -p1 -i "${srcdir}/lvm2-make-sockets-static.patch"
-  # fix udev rules
-  patch -p1 -i "${srcdir}/0001-udev-use-for-SYSTEMD_WANTS-instead-of.patch"
 }
 
 build() {