lvm2

update binary path to /usr/bin
refs #961

1 files changed, 52 insertions, 22 deletions

diff --git a/abs/core/lvm2/PKGBUILD b/abs/core/lvm2/PKGBUILD
index bda634b..e31f8a8 100644
--- a/abs/core/lvm2/PKGBUILD
+++ b/abs/core/lvm2/PKGBUILD
@@ -1,60 +1,85 @@
-# $Id: PKGBUILD 163019 2012-07-05 20:37:09Z eric $
+# $Id: PKGBUILD 199802 2013-11-16 17:53:26Z thomas $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.96
-pkgrel=3
+pkgver=2.02.104
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
+makedepends=('systemd' 'thin-provisioning-tools')
 groups=('base')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
         lvm2_install
         lvm2_hook
+        sd-lvm2
         11-dm-initramfs.rules
-        lvm.service
-        lvm2.conf)
-sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f'
-          '12e9016485c415c344524e6e75e23dfa6ca097ac'
-          '3e1680f9b76ce9150d08865d99db90fd15532271'
-          'cedc9948123c870f9c5aa3357d0075b41a9c8135'
+        lvm2.conf
+        dmeventd.service
+        dmeventd.socket
+        lvm-monitoring.service
+        lvmetad.service
+        lvmetad.socket)
+sha1sums=('4c296453e10deafe02004fde40075cdb3792eeb2'
+          'SKIP'
+          '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
+          'ff0fdf0a3005a41acd4b36865056109effc3474b'
+          '30777d42e31cb7fe1f4fadc1e8f4c4d4cdd8ffed'
           'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          '17df8689630a77e46899a8bd56997d9db896d5af'
-          'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
+          'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
+          '01782ce8e10718c1513e3906b126f30f682f5cab'
+          '1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
+          'aad90fce0e12eda41d38571d8eb27c5d5a8c59ec'
+          'f857a4a63fcc604a981e56875edda91767d4f1bf'
+          'fcfc265e3b10294cc4b10949a342e9db4310b186')
+
+prepare() {
+  cd LVM2.${pkgver}
+  # enable lvmetad
+  sed -i 's|use_lvmetad = 0|use_lvmetad = 1|' conf/example.conf.in
+}
 
 build() {
-  cd "${srcdir}/LVM2.${pkgver}"
+  cd LVM2.${pkgver}
   unset LDFLAGS
 
-  ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
-    --includedir=/usr/include --with-usrlibdir=/usr/lib  --libdir=/usr/lib --with-udev-prefix=/usr \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
-    --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules  \
-    --with-default-locking-dir=/run/lock/lvm
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \
+    --with-udev-prefix=/usr --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-default-pid-dir=/run --with-default-dm-run-dir=/run --with-default-run-dir=/run/lvm \
+    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
+    --enable-udev_sync --enable-udev_rules --with-default-locking-dir=/run/lock/lvm \
+    --enable-lvmetad --with-thin=internal
   make
 }
 
 package_device-mapper() {
   pkgdesc="Device mapper userspace library and tools"
   url="http://sourceware.org/dm/"
-  depends=('glibc' 'udev')
+  depends=('glibc' 'systemd')
 
-  cd "${srcdir}/LVM2.${pkgver}"
+  cd LVM2.${pkgver}
   make DESTDIR="${pkgdir}" install_device-mapper
   # extra udev rule for device-mapper in initramfs
   install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
+  # Install dmeventd socket and service
+  install -D -m644 "${srcdir}/dmeventd.service" "${pkgdir}/usr/lib/systemd/system/dmeventd.service"
+  install -D -m644 "${srcdir}/dmeventd.socket" "${pkgdir}/usr/lib/systemd/system/dmeventd.socket"
+  install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
+  ln -sf /usr/lib/systemd/system/dmeventd.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dmeventd.socket"
 }
 
 package_lvm2() {
   pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
+  depends=('bash' "device-mapper>=${pkgver}" 'systemd' 'readline')
   conflicts=('lvm' 'mkinitcpio<0.7')
   backup=('etc/lvm/lvm.conf')
   options=('!makeflags')
+  optdepends=('thin-provisioning-tools: For thin provisioning support.')
+  install=lvm2.install
 
-  cd "${srcdir}/LVM2.${pkgver}"
+  cd LVM2.${pkgver}
   make DESTDIR="${pkgdir}" install_lvm2
   # install applib
   make -C liblvm DESTDIR="${pkgdir}" install
@@ -63,7 +88,12 @@ package_lvm2() {
   # mkinitcpio hook
   install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
   install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
+  install -D -m644 "${srcdir}/sd-lvm2" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
   # systemd support
-  install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service"
   install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf"
+  install -D -m644 "${srcdir}/lvm-monitoring.service" "${pkgdir}/usr/lib/systemd/system/lvm-monitoring.service"
+  install -D -m644 "${srcdir}/lvmetad.service" "${pkgdir}/usr/lib/systemd/system/lvmetad.service"
+  install -D -m644 "${srcdir}/lvmetad.socket" "${pkgdir}/usr/lib/systemd/system/lvmetad.socket"
+  install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
+  ln -sf /usr/lib/systemd/system/lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/lvmetad.socket"
 }