[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2_install sd-lvm2_install)

Christian Hesse eworm at archlinux.org
Mon Mar 12 16:10:39 UTC 2018


    Date: Monday, March 12, 2018 @ 16:10:38
  Author: eworm
Revision: 318757

upgpkg: lvm2 2.02.177-5

Modified:
  lvm2/trunk/PKGBUILD
  lvm2/trunk/lvm2_install
  lvm2/trunk/sd-lvm2_install

-----------------+
 PKGBUILD        |   10 ++++------
 lvm2_install    |   19 +++++++------------
 sd-lvm2_install |   17 +++++++----------
 3 files changed, 18 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-12 15:22:25 UTC (rev 318756)
+++ PKGBUILD	2018-03-12 16:10:38 UTC (rev 318757)
@@ -5,7 +5,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.177
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -19,17 +19,14 @@
         '11-dm-initramfs.rules')
 sha256sums=('4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2'
             'SKIP'
-            '5129f87a8b30d5a8621e9c1c0664910a588bdd77bff09473afb73efb41305cbb'
+            'cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6'
             '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80'
-            'cc1ed670a7ca21ee2ab32ad6b5ab7a6a5e86d0651ea2e1593e289a82c87aa4da'
+            'b749c2da0e9307b0c2c3858d024a19c268e01e393e876a284fe1a302427f72f1'
             'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
 
 prepare() {
   cd LVM2.${pkgver}
 
-  # enable lvmetad
-  sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
-
   # remove install section from systemd units that are enabled by default
   sed -i -e '/^\[Install\]$/,$d' \
     scripts/dm_event_systemd_red_hat.socket.in \
@@ -53,6 +50,7 @@
     --enable-readline
     --enable-udev_rules
     --enable-udev_sync
+    --enable-use-lvmetad
     --with-cache=internal
     --with-default-dm-run-dir=/run
     --with-default-locking-dir=/run/lock/lvm

Modified: lvm2_install
===================================================================
--- lvm2_install	2018-03-12 15:22:25 UTC (rev 318756)
+++ lvm2_install	2018-03-12 16:10:38 UTC (rev 318757)
@@ -10,30 +10,25 @@
     done
 
     # binaries from lvm2
-    add_binary "/usr/bin/lvm"
-    add_binary "/usr/bin/lvmetad"
+    add_binary "lvm"
+    add_binary "lvmetad"
 
     # beinaries from device-mapper
-    add_binary "/usr/bin/dmsetup"
-    add_binary "/usr/bin/dmeventd"
+    add_binary "dmsetup"
 
-    # these are dlopen()ed
-    for library in libdevmapper-event-lvm2{mirror,raid,snapshot,thin}; do
-    	add_binary "/usr/lib/${library}.so"
-    done
-
     # from thin-provisioning-tools
-    add_binary "/usr/bin/pdata_tools"
+    add_binary "pdata_tools"
     for symlink in cache_{check,dump,metadata_size,repair,restore} thin_{check,delta,dump,ls,metadata_size,repair,restore,rmap,trim}; do
         add_symlink "/usr/bin/${symlink}" "pdata_tools"
     done
 
+    # udev rules and lvm configuration
     add_file "/usr/lib/udev/rules.d/10-dm.rules"
+    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
+    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
     add_file "/usr/lib/initcpio/udev/69-dm-lvm-metad.rules" "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
     add_file "/etc/lvm/lvm.conf"
 
     add_runscript

Modified: sd-lvm2_install
===================================================================
--- sd-lvm2_install	2018-03-12 15:22:25 UTC (rev 318756)
+++ sd-lvm2_install	2018-03-12 16:10:38 UTC (rev 318757)
@@ -11,19 +11,16 @@
 
     # device mapper and lvm2 systemd units
     # binaries and libraries are pull automatically, except ...
-    add_systemd_unit "dm-event.service"
     add_systemd_unit "lvm2-lvmetad.service"
     add_systemd_unit "lvm2-pvscan at .service"
-    add_symlink "/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket"
 
-    # ... dmsetup and ...
+    # binaries from lvm2
+    add_binary "lvm"
+    add_binary "lvmetad"
+
+    # beinaries from device-mapper
     add_binary "dmsetup"
 
-    # ... these, which are dlopen()ed
-    for library in libdevmapper-event-lvm2{mirror,raid,snapshot,thin}; do
-    	add_binary "/usr/lib/${library}.so"
-    done
-
     # from thin-provisioning-tools
     add_binary "pdata_tools"
     for symlink in cache_{check,dump,metadata_size,repair,restore} thin_{check,delta,dump,ls,metadata_size,repair,restore,rmap,trim}; do
@@ -32,10 +29,10 @@
 
     # udev rules and lvm configuration
     add_file "/usr/lib/udev/rules.d/10-dm.rules"
+    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+    add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
-    add_file "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
     add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
     add_file "/etc/lvm/lvm.conf"
 }



More information about the arch-commits mailing list