From d1c32883df01f83931c71af45c2a3c15ae9eacd8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 3 Aug 2020 10:26:17 -0400
Subject: [PATCH] dracut: avoid double copies in dracut-uefi subpackage

---
 srcpkgs/dracut/template | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 5dad17021f..8bde309e86 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -28,7 +28,6 @@ esac
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) # archs supported by dracut for EFI bundle
-		_efi_bundle=1
 		subpackages+=" dracut-uefi"
 	;;
 esac
@@ -49,12 +48,6 @@ post_install() {
 	vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 20-dracut
 	vinstall ${FILESDIR}/kernel-hook-postrm 755 etc/kernel.d/post-remove 20-dracut
 
-	if [ "${_efi_bundle}" ]; then
-		vinstall ${FILESDIR}/dracut-uefi-hook.confd 644 etc/default dracut-uefi-hook
-		vinstall ${FILESDIR}/kernel-uefi-hook-postinst 755 etc/kernel.d/post-install 20-dracut-uefi
-		vinstall ${FILESDIR}/kernel-uefi-hook-postrm 755 etc/kernel.d/post-remove 20-dracut-uefi
-	fi
-
 	# We don't need the systemd stuff.
 	rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
 	rm -f ${DESTDIR}/usr/share/man/man8/*.service.*
@@ -62,7 +55,7 @@ post_install() {
 }
 
 dracut-network_package() {
-	depends="dhclient dracut-${version}_${revision}"
+	depends="dhclient ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - network modules"
 	archs=noarch
 	pkg_install() {
@@ -74,12 +67,13 @@ dracut-network_package() {
 }
 
 dracut-uefi_package() {
-	depends="binutils gummiboot dracut-${version}_${revision}"
+	depends="binutils gummiboot ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - UEFI bundle hook"
 	conf_files="/etc/default/dracut-uefi-hook"
+
 	pkg_install() {
-		vmove etc/kernel.d/post-install/20-dracut-uefi
-		vmove etc/kernel.d/post-remove/20-dracut-uefi
-		vmove etc/default/dracut-uefi-hook
+		vinstall ${FILESDIR}/dracut-uefi-hook.confd 644 etc/default dracut-uefi-hook
+		vinstall ${FILESDIR}/kernel-uefi-hook-postinst 755 etc/kernel.d/post-install 20-dracut-uefi
+		vinstall ${FILESDIR}/kernel-uefi-hook-postrm 755 etc/kernel.d/post-remove 20-dracut-uefi
 	}
 }