From d01d002782fb80bc9da91c4417c632666d774ce8 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Mon, 10 Aug 2026 13:07:43 +0200
Subject: [PATCH] main/postmarketos-base: drop grub subpackage

With the last device using grub having been
moved to systemd-boot with pmaports!9135,
it is now unnecessary to include grub
configuration.

Removes the update-grub.conf config and
the postmarketos-base-grub subpackage.

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9361>
---
 main/postmarketos-base/APKBUILD                    | 11 +----------
 main/postmarketos-base/rootfs-etc-update-grub.conf |  4 ----
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 main/postmarketos-base/rootfs-etc-update-grub.conf

diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index 50da5bcd0..b28664569 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,7 +1,7 @@
 # Co-Maintainer: Achill Gilgenast <achill@achill.org>
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=postmarketos-base
-pkgver=66
+pkgver=67
 pkgrel=0
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
@@ -33,7 +33,6 @@ subpackages="
 	$pkgname-core
 	$pkgname-doas
 	$pkgname-fwupd
-	$pkgname-grub
 	$pkgname-mesa
 	$pkgname-nftables
 	$pkgname-nftables-openrc:nftables_openrc
@@ -68,7 +67,6 @@ _source644="
 	etc/fstab
 	etc/issue
 	etc/motd
-	etc/update-grub.conf
 	usr/lib/apk/config
 	usr/lib/os-release
 	usr/lib/kernel-cmdline.d/00-base.conf
@@ -176,12 +174,6 @@ fwupd() {
 	mkdir -p "$subpkgdir"
 }
 
-grub() {
-	install_if="$pkgname=$pkgver-r$pkgrel grub"
-
-	amove etc/update-grub.conf
-}
-
 mesa() {
 	depends="mesa-dri-gallium mesa-gles"
 	install_if="$pkgname=$pkgver-r$pkgrel mesa"
@@ -304,7 +296,6 @@ a96d556cafbb9b94be61a223f6c9174dfc909a432f7bd7899a655b9483f526a713e7e9d89407b545
 9b8d0493bb64457fe176fea801e0771d3c5279302c61559824bf81b3d2b66d2c1e076f4aaac65f55389005acb18c27e44bed858c2bdbad37d74199f07c86c354  rootfs-etc-fstab
 45bd0742a64a9d3c4a88e152b97edcf3fa1edca28884f9ea69e7c4c365f1e41ef9056dbe204545de7d4b2ba92e1e5872b2a929c2dcc1dd468e627cc3f090b8e6  rootfs-etc-issue
 01403df3b5a2be0dd70387a3c32cf24a77bc097679fbefca585082a0970b7d756723c33687be3809351b5e31c85947db84861118bfeced8f5f865fe2452555ec  rootfs-etc-motd
-4c7e378a66f61b5ab601d8886d5d9a7f6444564e792481d9926dfda0e3ccaca92196b1e7d29d20de5394b916b321f2176b056676aec0d73a1fdfafab55725c70  rootfs-etc-update-grub.conf
 224d58717f7f95851c91914753f4aefaf8964a2e62350ed898783c295c509cdadd85c325ee00baceb21ff2763ca2f4c7b1478a5638eb7d86836f91336b739376  rootfs-usr-lib-apk-config
 6593a61cb4cbb5d557bdd0f98ce09bf91a6e076cfe0023fe3f495e17044c8d586708328a0fae52b58b3ff008a347b1f63a222a2a4d4f3f4d95777531f8a5c1a8  rootfs-usr-lib-os-release
 2c251920d837bfef95f1ba5f768cd5365d2efce9f1b6454ceed574a16e04d29b7c8e866a9e811abd4699ce57c73962421a1859799f76c24c157b87b21f9039f3  rootfs-usr-lib-kernel-cmdline.d-00-base.conf
diff --git a/main/postmarketos-base/rootfs-etc-update-grub.conf b/main/postmarketos-base/rootfs-etc-update-grub.conf
deleted file mode 100644
index 597546eef..000000000
--- a/main/postmarketos-base/rootfs-etc-update-grub.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# GRUB's update-grub cannot run properly in a chroot and fails to find the
-# initramfs because it has no flavor suffix.
-# Instead, boot-deploy is used for generating the grub config
-disable_trigger=1