From d446222fe199e9ff1be5f2e109b9f66be6ed1604 Mon Sep 17 00:00:00 2001
From: joborun <joborun@disroot.org>
Date: Wed, 29 May 2024 19:42:34 +0300
Subject: [PATCH] upg mkinitcpio

---
 mkinitcpio/0001-trigger.patch | 13 +++++++++++++
 mkinitcpio/PKGBUILD           | 11 +++++++----
 mkinitcpio/PKGBUILD-arch      | 16 ++++++++++++----
 3 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 mkinitcpio/0001-trigger.patch

diff --git a/mkinitcpio/0001-trigger.patch b/mkinitcpio/0001-trigger.patch
new file mode 100644
index 0000000..cfe625f
--- /dev/null
+++ b/mkinitcpio/0001-trigger.patch
@@ -0,0 +1,13 @@
+diff --git a/libalpm/hooks/90-mkinitcpio-install.hook b/libalpm/hooks/90-mkinitcpio-install.hook
+index 446b7d7..5582f12 100644
+--- a/libalpm/hooks/90-mkinitcpio-install.hook
++++ b/libalpm/hooks/90-mkinitcpio-install.hook
+@@ -6,6 +6,8 @@ Operation = Remove
+ Target = usr/lib/initcpio/*
+ Target = usr/lib/firmware/*
+ Target = usr/src/*/dkms.conf
++Target = usr/bin/cryptsetup
++Target = usr/bin/lvm
+ 
+ [Trigger]
+ Type = Path
diff --git a/mkinitcpio/PKGBUILD b/mkinitcpio/PKGBUILD
index 24db075..e9b349e 100644
--- a/mkinitcpio/PKGBUILD
+++ b/mkinitcpio/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=mkinitcpio
 pkgver=39.2
-pkgrel=01
+pkgrel=02
 pkgdesc="Modular initramfs image creation utility w/o systemd zstd "
 makedepends=('binutils' 'asciidoc' 'sed')
 depends=('awk' 'mkinitcpio-busybox>=1.35.0' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
@@ -38,7 +38,8 @@ source=("$url/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
 	'use_xz_as_default.patch'
 	'mkinitcpio.conf'
 	'LICENSE' 
-	'LICENSE-obarun')
+	'LICENSE-obarun'
+        '0001-trigger.patch')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -48,6 +49,7 @@ prepare() {
   patch -Np2 < ../remove_fsck_warning.patch
   patch -Np2 < ../remove_uki_test.patch
   patch -Np2 < ../use_xz_as_default.patch
+  patch -Np1 < ../0001-trigger.patch
 }
 
 check() {
@@ -95,7 +97,8 @@ sha256sums=(bc37195fab724c42e154a93e6ab797410161c07f223302898673c0e17afd8e0a  #
 	0c94f36e971599e560398f20561eb7b979b3a9108065422f33ddf4b14f4c1547  # use_xz_as_default.patch
 	08e6b8ab289b77c122c7ab4b02ad2795152eb72d17b1a9e5b719fdb0be54d246  # mkinitcpio.conf
 	0259339beff6d1a335fc05c97ca104a54ed6baf056a69d04636950fb81e441f5  # LICENSE
-	37deb048dd216c0b065f57fd8969dcf85c9d18f9dbd0ee3612c942037c2acc71) # LICENSE-obarun
+	37deb048dd216c0b065f57fd8969dcf85c9d18f9dbd0ee3612c942037c2acc71  # LICENSE-obarun
+	5057c91760497912b3e5e6bd921852c1ef8cb924b2e0993996a4bd0af0ec1bba) # 0001-trigger.patch
 
-##  bfd22e8bcea13da95894778917a21759c85208d83f371176b3d3d38e11bec6f3  mkinitcpio-39.2-01-x86_64.pkg.tar.lz
+##  3bfda79cb5d171d4a78e3a8c4703fb29c1c1954ff117be0a16d1c21d7236c3b8  mkinitcpio-39.2-02-x86_64.pkg.tar.lz
 
diff --git a/mkinitcpio/PKGBUILD-arch b/mkinitcpio/PKGBUILD-arch
index 922030e..da0e9a5 100644
--- a/mkinitcpio/PKGBUILD-arch
+++ b/mkinitcpio/PKGBUILD-arch
@@ -5,7 +5,7 @@
 
 pkgname=mkinitcpio
 pkgver=39.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio'
@@ -22,14 +22,22 @@ optdepends=('gzip: Use gzip compression for the initramfs image'
             'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
 provides=('initramfs')
 backup=('etc/mkinitcpio.conf')
-source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+        '0001-trigger.patch')
 sha512sums=('e4ba9fe901da56bb116510ec0c6abeba5153e57d9545baccbc466932951b7f324aa75ef7cc3de87f966456b0365b17552f367411d62585d500e88dc5c815058b'
-            'SKIP')
+            'SKIP'
+            'b21e3961294e80bedd89a7e332ab11fc3b83eebfaf58d8f658e30f7d9caf2f84f4934224173c70f111932de8538fa327f5f6bfe9576b11bcbaf84d2d5ad8e85d')
 b2sums=('7bd6bf491dd8b23d83e42834566375736cf8868d5120c7e24f4c8923eb03a64864cdda51d6a6f41373db88c29905535e4c8aa4bde172955bc7529e6b3ffc252c'
-        'SKIP')
+        'SKIP'
+        '3b8e08d56e209ad11827d65595ab245bb680e72fb81139ba946e7610d16214c2a9022f1a1794e6797ef07fb0a43c5239167729225daf89396a8920f39f75e34b')
 validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB'    # Giancarlo Razzolini
               'C100346676634E80C940FB9E9C02FF419FECBE16')   # Morten Linderud
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 < ../0001-trigger.patch
+}
+
 check() {
   make -C "$pkgname-$pkgver" check
 }