5.3.6-2 (clr 5.3.1-11) remove initramfs remove hook file

4 files changed, 7 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d46001a0f25a..6b24b860848a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-clear-current
 	pkgver = 5.3.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/clearlinux-pkgs/linux-current
 	arch = x86_64
 	license = GPL2
@@ -19,7 +19,6 @@ pkgbase = linux-clear-current
 	source = enable_additional_cpu_optimizations-20190822.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20190822.tar.gz
 	source = 60-linux.hook
 	source = 90-linux.hook
-	source = 99-linux.hook
 	source = linux.preset
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
@@ -30,7 +29,6 @@ pkgbase = linux-clear-current
 	sha256sums = 8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5
 	sha256sums = 452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c
 	sha256sums = c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636
-	sha256sums = ed9d35cb7d7bd829ff6253353efa5e2d119820fe4f4310aea536671f5e4caa37
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 
 pkgname = linux-clear-current
diff --git a/99-linux.hook b/99-linux.hook
deleted file mode 100644
index 416cb9424d0d..000000000000
--- a/99-linux.hook
+++ /dev/null
@@ -1,9 +0,0 @@
-[Trigger]
-Type = File
-Operation = Remove
-Target = boot/vmlinuz-%PKGBASE%
-
-[Action]
-Description = Remove %PKGBASE% initramfs files...
-When = PreTransaction
-Exec = /usr/bin/rm -f /boot/initramfs-%PKGBASE%.img /boot/initramfs-%PKGBASE%-fallback.img
diff --git a/PKGBUILD b/PKGBUILD
index 2d1e951029c4..2334d850d7d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,7 +64,7 @@ _srcname=linux-${_major}
 _clr=${_major}.1-11
 pkgbase=linux-clear-current
 pkgver=${_major}.${_minor}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://github.com/clearlinux-pkgs/linux-current"
 license=('GPL2')
@@ -79,7 +79,6 @@ source=(
   "enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
   '60-linux.hook'  # pacman hook for depmod
   '90-linux.hook'  # pacman hook for initramfs regeneration
-  '99-linux.hook'  # pacman hook for remove initramfs
   'linux.preset'   # standard config files for mkinitcpio ramdisk
 )
 
@@ -223,8 +222,6 @@ _package() {
         "$pkgdir/usr/share/libalpm/hooks/60-${pkgbase}.hook"
     sed "$subst" ../90-linux.hook | install -Dm644 /dev/stdin \
         "$pkgdir/usr/share/libalpm/hooks/90-${pkgbase}.hook"
-    sed "$subst" ../99-linux.hook | install -Dm644 /dev/stdin \
-        "$pkgdir/usr/share/libalpm/hooks/99-${pkgbase}.hook"
 
     msg2 "Fixing permissions..."
     chmod -Rc u=rwX,go=rX "$pkgdir"
@@ -323,7 +320,6 @@ sha256sums=('78f3c397513cf4ff0f96aa7d09a921d003e08fa97c09e0bb71d88211b40567b2'
             '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
             '452b8d4d71e1565ca91b1bebb280693549222ef51c47ba8964e411b2d461699c'
             'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
-            'ed9d35cb7d7bd829ff6253353efa5e2d119820fe4f4310aea536671f5e4caa37'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 
 validpgpkeys=(
diff --git a/linux.install b/linux.install
index 1ce754cf823a..ec870eb24222 100644
--- a/linux.install
+++ b/linux.install
@@ -12,3 +12,8 @@ post_upgrade() {
     echo "WARNING: /boot appears to be a separate partition but is not mounted."
   fi
 }
+
+post_remove() {
+  rm -f boot/initramfs-%PKGBASE%.img
+  rm -f boot/initramfs-%PKGBASE%-fallback.img
+}