Bump version and update initramfs hook

3 files changed, 21 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea6f850a43ae..d5a4d84a3af4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lvm2-noudev
-	pkgver = 2.02.183
-	pkgrel = 2
+	pkgver = 2.02.184
+	pkgrel = 4
 	url = https://sourceware.org/lvm2/
 	arch = x86_64
 	groups = base
@@ -8,7 +8,7 @@ pkgbase = lvm2-noudev
 	license = LGPL2.1
 	makedepends = git
 	makedepends = thin-provisioning-tools
-	source = git+https://sourceware.org/git/lvm2.git#tag=v2_02_183?signed
+	source = git+https://sourceware.org/git/lvm2.git#tag=v2_02_184?signed
 	source = lvm2_install
 	source = lvm2_hook
 	source = 11-dm-initramfs.rules
@@ -16,13 +16,14 @@ pkgbase = lvm2-noudev
 	validpgpkeys = D501A478440AE2FD130A1BE8B9112431E509039F
 	sha256sums = SKIP
 	sha256sums = cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6
-	sha256sums = 97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80
+	sha256sums = 2ecaabfa13dd09d0e3d7b3439147fbd93e3c87a418b676fa55647f9319ada667
 	sha256sums = e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0
 
 pkgname = lvm2-noudev
 	pkgdesc = Logical Volume Manager 2 utilities
 	depends = bash
-	depends = device-mapper>=2.02.183
+	depends = device-mapper>=2.02.184
+	depends = libeudev
 	depends = libutil-linux
 	depends = readline
 	depends = thin-provisioning-tools
@@ -38,6 +39,6 @@ pkgname = device-mapper-noudev
 	pkgdesc = Device mapper userspace library and tools
 	url = http://sourceware.org/dm/
 	depends = glibc
-	provides = device-mapper=2.02.183
+	provides = device-mapper=2.02.184
 	conflicts = device-mapper
 
diff --git a/PKGBUILD b/PKGBUILD
index 496b3c5e01ad..d300b7f8be09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,18 @@
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 
-# noudev: udev support is only kept in initramfs
+# noudev changes:
+# - disable eudev dependency
+# - disable udev in _CONFIGUREOPTS
+# - explicitly disable all udev options when building lvm2
+# - enable options only for udev rules
+# - add 'provides' and 'conflicts' fields for packages
+# - lvm2_hook: add vgchange command
 
 pkgbase=lvm2-noudev
 pkgname=('lvm2-noudev' 'device-mapper-noudev')
-pkgver=2.02.183
-pkgrel=2
+pkgver=2.02.184
+pkgrel=4
 arch=('x86_64')
 url='https://sourceware.org/lvm2/'
 license=('GPL2' 'LGPL2.1')
@@ -21,7 +27,7 @@ source=("git+https://sourceware.org/git/lvm2.git#tag=v${pkgver//./_}?signed"
         '11-dm-initramfs.rules')
 sha256sums=('SKIP'
             'cc51940a8437f3c8339bb9cec7e929b2cc0852ffc8a0b2463e6f67ca2b9950f6'
-            '97d7c92e4954bc0108e7cd183b2eb5fe7ecc97e6f56369669e6537cb6ed45d80'
+            '2ecaabfa13dd09d0e3d7b3439147fbd93e3c87a418b676fa55647f9319ada667'
             'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
 
 build() {
@@ -78,7 +84,7 @@ package_device-mapper-noudev() {
 
 package_lvm2-noudev() {
   pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'libutil-linux' 'readline' 'thin-provisioning-tools')
+  depends=('bash' "device-mapper>=${pkgver}" 'libeudev' 'libutil-linux' 'readline' 'thin-provisioning-tools')
   conflicts=('lvm' 'mkinitcpio<0.7' 'lvm2')
   provides=('lvm2')
   backup=('etc/lvm/lvm.conf'
diff --git a/lvm2_hook b/lvm2_hook
index 3c28d67ffb97..2c94630738bf 100644
--- a/lvm2_hook
+++ b/lvm2_hook
@@ -5,6 +5,9 @@ run_earlyhook() {
     lvmetad
 }
 
+run_hook() {
+    lvm vgchange -a y
+}
 # We are suffering a race condition in non-systemd initramfs: If lvmetad is
 # killed before pvscan processes finish we have stale processes and
 # uninitialized physical volumes. So wait for pvscan processes to finish.