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

[Christian Hesse]

    Date: Thursday, December 19, 2019 @ 08:31:29
  Author: eworm
Revision: 371840

upgpkg: lvm2 2.02.186-4

fix warning in udev rule

Modified:
  lvm2/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-19 07:14:35 UTC (rev 371839)
+++ PKGBUILD	2019-12-19 08:31:29 UTC (rev 371840)
@@ -4,7 +4,7 @@
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.186
-pkgrel=3
+pkgrel=4
 arch=('x86_64')
 url='https://sourceware.org/lvm2/'
 license=('GPL2' 'LGPL2.1')
@@ -25,6 +25,9 @@
 _backports=(
   # pvscan: fix activation of incomplete VGs
   '6b12930860a993624d6325aec2e9c561f4412aa9'
+
+  # udev: remove unsupported OPTIONS+="event_timeout" rule
+  '125f27ac37bc9b93cc96f64052b9681b3d479ee1'
 )
 
 prepare() {
@@ -71,7 +74,7 @@
   )
 
   cp -a lvm2/ lvm2-initramfs/
-  
+
   cd lvm2/
 
   ./configure "${_CONFIGUREOPTS[@]}" --enable-udev-systemd-background-jobs
@@ -93,11 +96,11 @@
 
   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 -D -m0644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
   # Install dmeventd socket and service
   make DESTDIR="${pkgdir}" install_systemd_units
   rm -f "${pkgdir}/usr/lib/systemd/system/"{blk-availability.service,lvm2-*}
-  install -d -m755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
+  install -d -m0755 "${pkgdir}/usr/lib/systemd/system/sockets.target.wants"
   ln -sf ../dm-event.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dm-event.socket"
 }
 
@@ -117,15 +120,15 @@
   # /etc directories
   install -d "${pkgdir}"/etc/lvm/{archive,backup}
   # 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_install" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
+  install -D -m0644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
+  install -D -m0644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
+  install -D -m0644 "${srcdir}/sd-lvm2_install" "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
   # extra udev rule for lvmetad in non-systemd initramfs
-  install -D -m644 "${srcdir}/lvm2-initramfs/udev/69-dm-lvm-metad.rules" "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm-metad.rules"
+  install -D -m0644 "${srcdir}/lvm2-initramfs/udev/69-dm-lvm-metad.rules" "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm-metad.rules"
   # systemd support
   make DESTDIR="${pkgdir}" install_systemd_units
   rm -f "${pkgdir}/usr/lib/systemd/system/"dm-*
-  install -d -m755 "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants"
+  install -d -m0755 "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants"
   ln -sf ../lvm2-lvmetad.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmetad.socket"
   ln -sf ../lvm2-lvmpolld.socket "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-lvmpolld.socket"
   ln -sf ../lvm2-monitor.service "${pkgdir}/usr/lib/systemd/system/sysinit.target.wants/lvm2-monitor.service"