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

[Christian Hesse]

    Date: Monday, January 29, 2018 @ 13:47:08
  Author: eworm
Revision: 315563

upgpkg: lvm2 2.02.177-3

ll

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

-----------------+
 PKGBUILD        |   16 ++++++++--------
 lvm2_install    |   11 +++++++++--
 sd-lvm2_install |   22 ++++++++++++----------
 3 files changed, 29 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-29 13:05:00 UTC (rev 315562)
+++ PKGBUILD	2018-01-29 13:47:08 UTC (rev 315563)
@@ -5,7 +5,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.177
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -12,16 +12,16 @@
 makedepends=('systemd' 'thin-provisioning-tools')
 groups=('base')
 validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17') # Alasdair G Kergon <agk at redhat.com>
-source=(https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${pkgver}.tgz{,.asc}
-        lvm2_install
-        lvm2_hook
-        sd-lvm2_install
-        11-dm-initramfs.rules)
+source=("https://mirrors.kernel.org/sourceware/lvm2/releases/LVM2.${pkgver}.tgz"{,.asc}
+        'lvm2_install'
+        'lvm2_hook'
+        'sd-lvm2_install'
+        '11-dm-initramfs.rules')
 sha256sums=('4025a23ec9b15c2cb7486d151c29dc953b75efc4d452cfe9dbbc7c0fac8e80f2'
             'SKIP'
-            'd3097296bdfd9912dbef6ac78b908f7017b0a668a5347f0811f1c3aaacdca0cf'
+            '5129f87a8b30d5a8621e9c1c0664910a588bdd77bff09473afb73efb41305cbb'
             '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80'
-            'ca25d7d827823ed88c5ed662d561ad9de0123ca6e8e5b568fe9eec3c89918614'
+            'b9f5fda718ccf30d964b26b9025f4814dd35a821da8648e204e8640d6ae89c42'
             'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
 
 prepare() {

Modified: lvm2_install
===================================================================
--- lvm2_install	2018-01-29 13:05:00 UTC (rev 315562)
+++ lvm2_install	2018-01-29 13:47:08 UTC (rev 315563)
@@ -4,17 +4,24 @@
     local mod
     local symlink
 
+    # device mapper modules
     for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
         add_module "$mod"
     done
 
-    # from lvm2
+    # binaries from lvm2
     add_binary "/usr/bin/lvm"
     add_binary "/usr/bin/lvmetad"
 
-    # from device-mapper
+    # beinaries from device-mapper
     add_binary "/usr/bin/dmsetup"
+    add_binary "/usr/bin/dmeventd"
 
+    # 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"
     for symlink in cache_{check,dump,metadata_size,repair,restore} thin_{check,delta,dump,ls,metadata_size,repair,restore,rmap,trim}; do

Modified: sd-lvm2_install
===================================================================
--- sd-lvm2_install	2018-01-29 13:05:00 UTC (rev 315562)
+++ sd-lvm2_install	2018-01-29 13:47:08 UTC (rev 315563)
@@ -4,16 +4,22 @@
     local mod
     local symlink
 
+    # device mapper modules
     for mod in dm-mod dm-snapshot dm-mirror dm-cache dm-cache-smq dm-thin-pool; do
         add_module "$mod"
     done
 
-    # from lvm2
-    add_binary "/usr/bin/lvm"
-    add_binary "/usr/bin/lvmetad"
+    # 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"
 
-    # from device-mapper
-    add_binary "/usr/bin/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 "/usr/bin/pdata_tools"
@@ -21,6 +27,7 @@
         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/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
@@ -28,11 +35,6 @@
     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"
-
-    add_file "/usr/lib/systemd/system/lvm2-lvmetad.service"
-    add_file "/usr/lib/systemd/system/lvm2-lvmetad.socket"
-    add_file "/usr/lib/systemd/system/lvm2-pvscan at .service"
-    add_symlink "/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket"
 }
 
 help() {