From c5672bee4d97497cd20f2183256dde5aefc5340e Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 9 Jul 2021 18:38:43 +0200
Subject: [PATCH] mkinitcpio: remove dependency on -lvm2 from -encrypt
 subpackage

encrypt hook does not depend on lvm2 nor lvm2 hook. It just needs
11-dm-initramfs.rules, so I moved to the base package.
---
 srcpkgs/mkinitcpio/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index d3f89d78138..ee5ff2025d5 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
 # Template file for 'mkinitcpio'
 pkgname=mkinitcpio
 version=30
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc"
 depends="busybox-static bsdtar bash"
@@ -24,6 +24,9 @@ post_install() {
 	vinstall ${FILESDIR}/udev_hook 644 usr/lib/initcpio/hooks udev
 	vinstall ${FILESDIR}/udev_install 644 usr/lib/initcpio/install udev
 
+	# Install udev rule used by both lvm2 and encrypt hook
+	vinstall ${FILESDIR}/11-dm-initramfs.rules 644 usr/lib/initcpio/udev
+
 	# Remove unneeded systemd bits
 	rm -rf ${DESTDIR}/usr/lib/kernel
 	rm -rf ${DESTDIR}/usr/lib/systemd
@@ -45,15 +48,12 @@ mkinitcpio-lvm2_package() {
 	pkg_install() {
 		vinstall ${FILESDIR}/lvm2_hook 644 usr/lib/initcpio/hooks lvm2
 		vinstall ${FILESDIR}/lvm2_install 644 usr/lib/initcpio/install lvm2
-		for RULES in ${FILESDIR}/*.rules; do
-			vinstall $RULES 644 usr/lib/initcpio/udev $(basename $RULES)
-		done
+		vinstall ${FILESDIR}/69-dm-lvm-metad.rules 644 usr/lib/initcpio/udev
 	}
 }
 
 mkinitcpio-encrypt_package() {
-	depends="${sourcepkg}>=${version}_${revision}
-		${sourcepkg}-lvm2>=${version}_${revision} cryptsetup"
+	depends="${sourcepkg}>=${version}_${revision} cryptsetup"
 	short_desc+=" - encrypt support"
 	pkg_install() {
 		vinstall ${FILESDIR}/encrypt_hook 644 usr/lib/initcpio/hooks encrypt