summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/grub/APKBUILD40
-rw-r--r--user/grub/adelie-branding.patch2
2 files changed, 25 insertions, 17 deletions
diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD
index 06e574c8d..610e5e3c6 100644
--- a/user/grub/APKBUILD
+++ b/user/grub/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=grub
pkgver=2.04
-pkgrel=1
+pkgrel=2
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@@ -10,11 +10,12 @@ arch="all !s390x"
options="!check !strip" # Cannot test boot loader.
license="GPL-3.0+"
depends=""
-makedepends="bison flex freetype-dev linux-headers lvm2-dev python3 xz unifont
+makedepends="bison flex freetype-dev fuse-dev linux-headers lvm2-dev python3
+ unifont xz
automake autoconf libtool"
# [22:02] <@awilfox> [[sroracle]]: grub breaks without its locale files present
# [22:02] <@awilfox> it cannot be split
-subpackages="$pkgname-dev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-mount"
# currently grub only builds on x86*, aarch64 and ppc* systems
flavors=""
@@ -138,39 +139,46 @@ package() {
bios() {
pkgdesc="$pkgdesc (BIOS version)"
depends="$pkgname"
- mkdir -p $subpkgdir/usr/lib/grub
- mv $pkgdir/usr/lib/grub/*-pc $subpkgdir/usr/lib/grub/
+ mkdir -p "$subpkgdir"/usr/lib/grub
+ mv "$pkgdir"/usr/lib/grub/*-pc "$subpkgdir"/usr/lib/grub/
}
efi() {
pkgdesc="$pkgdesc (EFI version)"
depends="$pkgname efibootmgr efivar"
- mkdir -p $subpkgdir/usr/lib/grub
- mv $pkgdir/usr/lib/grub/*-efi $subpkgdir/usr/lib/grub/
+ mkdir -p "$subpkgdir"/usr/lib/grub
+ mv "$pkgdir"/usr/lib/grub/*-efi "$subpkgdir"/usr/lib/grub/
}
xenhost() {
- pkgdesc="$pkgdesc (XEN host version)"
- mkdir -p $subpkgdir/usr/lib/grub-xen
- mv $pkgdir/*-xen.bin $subpkgdir/usr/lib/grub-xen/
+ pkgdesc="$pkgdesc (Xen host version)"
+ mkdir -p "$subpkgdir"/usr/lib/grub-xen
+ mv "$pkgdir"/*-xen.bin "$subpkgdir"/usr/lib/grub-xen/
}
ieee1275() {
- pkgdesc="$pkgdesc (IEEE1275 version)"
+ pkgdesc="$pkgdesc (IEEE-1275 OpenFirmware version)"
depends="$pkgname powerpc-utils"
- mkdir -p $subpkgdir/usr/lib/grub
- mv $pkgdir/usr/lib/grub/*-ieee1275 $subpkgdir/usr/lib/grub/
+ mkdir -p "$subpkgdir"/usr/lib/grub
+ mv "$pkgdir"/usr/lib/grub/*-ieee1275 "$subpkgdir"/usr/lib/grub/
}
emu() {
pkgdesc="$pkgdesc (EMU version)"
depends="$pkgname"
- mkdir -p $subpkgdir/usr/lib/grub
- mv $pkgdir/usr/lib/grub/*-emu $subpkgdir/usr/lib/grub/
+ mkdir -p "$subpkgdir"/usr/lib/grub
+ mv "$pkgdir"/usr/lib/grub/*-emu "$subpkgdir"/usr/lib/grub/
+}
+
+mount() {
+ pkgdesc="Utility to mount filesystems using GRUB modules"
+ depends="$pkgname"
+ mkdir -p "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/usr/bin/grub-mount "$subpkgdir"/usr/bin/
}
sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb grub-2.04.tar.xz
-f8c9af848c14abc3e4cc749b3ec80432d1d69bf945c8e48f1650ec35d2442450dc0436a02a4737d5d06f21d5fdef54a91120a393e8d77a6b55aeb897aa1fe85c adelie-branding.patch
+4a6c909a1150b057fb0563f7a0646db33e16f84d6a8c443ef7db4003efd56c211a52f87699c5c95a6ccde65f6db46a8711a5b784f38479db804938dfe3115439 adelie-branding.patch
f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch
6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch
4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg
diff --git a/user/grub/adelie-branding.patch b/user/grub/adelie-branding.patch
index 606c1e6e9..463d4bcf5 100644
--- a/user/grub/adelie-branding.patch
+++ b/user/grub/adelie-branding.patch
@@ -13,7 +13,7 @@
+case "x${GRUB_DISTRIBUTOR}" in
+ x)
+ OS=GNU/Linux;;
-+ xAdélie|xAdelie)
++ xAdélie|xAdelie|xadelie)
+ OS="Adélie Linux";
+ CLASS="--class adelie";;
+ *)