main/postmarketos-base: disable GRUB trigger
Signed-off-by: Jens Reidel <adrian@postmarketos.org> Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7153>
This commit is contained in:
parent
78eed6fc98
commit
12f3380e78
2 changed files with 15 additions and 2 deletions
|
|
@ -1,6 +1,6 @@
|
|||
pkgname=postmarketos-base
|
||||
pkgver=48
|
||||
pkgrel=1
|
||||
pkgver=49
|
||||
pkgrel=0
|
||||
pkgdesc="Meta package for minimal postmarketOS base"
|
||||
url="https://postmarketos.org"
|
||||
arch="noarch"
|
||||
|
|
@ -32,6 +32,7 @@ install="$pkgname.post-install $pkgname.post-upgrade"
|
|||
triggers="$pkgname.trigger=/usr/share/deviceinfo"
|
||||
subpackages="
|
||||
$pkgname-core
|
||||
$pkgname-grub
|
||||
$pkgname-mesa
|
||||
$pkgname-nftables
|
||||
$pkgname-nftables-openrc:nftables_openrc
|
||||
|
|
@ -71,6 +72,7 @@ _source644="
|
|||
etc/issue
|
||||
etc/motd
|
||||
etc/udev/udev.conf
|
||||
etc/update-grub.conf
|
||||
usr/lib/apk/config
|
||||
usr/lib/os-release
|
||||
usr/lib/sysctl.d/90-disable-rp-filter.conf
|
||||
|
|
@ -151,6 +153,12 @@ core() {
|
|||
ln -s usr/sbin "$subpkgdir"/sbin
|
||||
}
|
||||
|
||||
grub() {
|
||||
install_if="$pkgname=$pkgver-r$pkgrel grub"
|
||||
|
||||
amove etc/update-grub.conf
|
||||
}
|
||||
|
||||
mesa() {
|
||||
replaces=""
|
||||
depends="mesa-dri-gallium mesa-gles"
|
||||
|
|
@ -246,6 +254,7 @@ e4576c58c35f80bedddb1e89e186f37d31a186d3e9eb046581b8c5d7b7d435e18924539e851d3e67
|
|||
45bd0742a64a9d3c4a88e152b97edcf3fa1edca28884f9ea69e7c4c365f1e41ef9056dbe204545de7d4b2ba92e1e5872b2a929c2dcc1dd468e627cc3f090b8e6 rootfs-etc-issue
|
||||
01403df3b5a2be0dd70387a3c32cf24a77bc097679fbefca585082a0970b7d756723c33687be3809351b5e31c85947db84861118bfeced8f5f865fe2452555ec rootfs-etc-motd
|
||||
6025282c9513835ae8e8d71a17ee81a6ef75c9651a5db9d6f018867264705f4eb874089abe2f01e31808486951c44d9dd8191ac0298734d905e772494b363f43 rootfs-etc-udev-udev.conf
|
||||
4c7e378a66f61b5ab601d8886d5d9a7f6444564e792481d9926dfda0e3ccaca92196b1e7d29d20de5394b916b321f2176b056676aec0d73a1fdfafab55725c70 rootfs-etc-update-grub.conf
|
||||
224d58717f7f95851c91914753f4aefaf8964a2e62350ed898783c295c509cdadd85c325ee00baceb21ff2763ca2f4c7b1478a5638eb7d86836f91336b739376 rootfs-usr-lib-apk-config
|
||||
6593a61cb4cbb5d557bdd0f98ce09bf91a6e076cfe0023fe3f495e17044c8d586708328a0fae52b58b3ff008a347b1f63a222a2a4d4f3f4d95777531f8a5c1a8 rootfs-usr-lib-os-release
|
||||
b70ee1b39b5f33c9a3e6bf4259158519691c82c8cefb700d4df49eb749a2cce208082e00d4905b9eea2c4f75b6da62f73931931c92157b4132adb35dcf0e0a6f rootfs-usr-lib-sysctl.d-90-disable-rp-filter.conf
|
||||
|
|
|
|||
4
main/postmarketos-base/rootfs-etc-update-grub.conf
Normal file
4
main/postmarketos-base/rootfs-etc-update-grub.conf
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
# 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
|
||||
Loading…
Add table
Add a link
Reference in a new issue