From 8b868f32f7e1b57c90da65157ea59eb6ce337cc9 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 1 Oct 2023 03:44:11 -0500 Subject: user/grub: Update to 2.12_rc1 Fixes: #1065, #1066, #1073 --- user/grub/APKBUILD | 77 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 34 deletions(-) (limited to 'user/grub/APKBUILD') diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 187dc3524..8b365fc0b 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -1,30 +1,32 @@ # Contributor: Carlo Landmeter # Maintainer: A. Wilcox pkgname=grub -pkgver=2.04 -pkgrel=5 -pkgdesc="Bootloader with support for Linux, Multiboot and more" +pkgver=2.12_rc1 +_pkgver=$(printf '%s' "$pkgver" | tr _ \~) +pkgrel=0 +pkgdesc="Boot loader with support for Linux, Multiboot and more" url="https://www.gnu.org/software/grub/" -arch="all !s390x" +arch="all" # strip handled by grub Makefiles, abuild strip breaks xen pv-grub options="!check !strip" # Cannot test boot loader. license="GPL-3.0+" depends="" makedepends="bison flex freetype-dev fuse-dev linux-headers lvm2-dev python3 - unifont xz - automake autoconf libtool" + unifont xz" # [22:02] <@awilfox> [[sroracle]]: grub breaks without its locale files present # [22:02] <@awilfox> it cannot be split subpackages="$pkgname-dev $pkgname-doc $pkgname-mount" -# currently grub only builds on x86*, aarch64 and ppc* systems flavors="" case "$CARCH" in -x86 | pmmx) flavors="efi bios";; +x86|pmmx) flavors="efi bios";; x86_64) flavors="efi bios xenhost";; -aarch64|arm*) flavors="efi";; +aarch64) flavors="efi";; +arm*) flavors="efi uboot";; ppc*) flavors="ieee1275"; makedepends="$makedepends powerpc-utils" ;; -s390x) flavors="emu" ;; +sparc*) flavors="ieee1275";; +mips*) flavors="arc";; +riscv*) flavors="efi";; esac for f in $flavors; do subpackages="$subpackages $pkgname-$f" @@ -32,28 +34,32 @@ done install="$pkgname.post-upgrade" -source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz +source="https://alpha.gnu.org/gnu/$pkgname/$pkgname-$_pkgver.tar.xz adelie-branding.patch - fix-gcc-no-pie-specs.patch grub2-accept-empty-module.patch - fix-deprecated-fgrep-usage.patch + 0001-unmerged-usr.patch + 0002-revert-gawk.patch + 0003-spcr-revision.patch + 0004-videoinfo-no-reinit.patch + 0005-vsnprintf.patch + 0006-cryptodisk-retval.patch + 0007-efi_gop-shadow.patch + 0008-efi-pure64.patch + 0009-linux-mixed-mode.patch + 0010-fix-gcc-no-pie-specs.patch grub-xen-host_grub.cfg default-grub update-grub quirk-01_radeon_agpmode " - -prepare() { - default_prepare - autoreconf -vif -} +builddir="$srcdir/$pkgname-$_pkgver" _build_flavor() { - local flavor="$1" + flavor="$1" shift - local _configure="$@" + _configure="$@" case $CTARGET_ARCH in - ppc64) export CFLAGS="-O2 -ggdb -mcpu=970 -mno-altivec";; # Workaround for http://savannah.gnu.org/bugs/?52629 + ppc64) export CFLAGS="${CFLAGS} -mno-altivec";; # Workaround for http://savannah.gnu.org/bugs/?52629 esac msg "Building grub for platform $flavor" @@ -74,7 +80,7 @@ _build_flavor() { } build() { - local f + f="" for f in $flavors; do case "$f" in bios) _build_flavor $f --with-platform=pc;; @@ -109,7 +115,7 @@ _install_xen() { } _install_flavor() { - local flavor="$1" + flavor="$1" cd "$srcdir"/build-$flavor case $flavor in xenhost) _install_xen;; @@ -162,18 +168,13 @@ xenhost() { ieee1275() { pkgdesc="$pkgdesc (IEEE-1275 OpenFirmware version)" - depends="$pkgname powerpc-utils" + case $CTARGETARCH in + ppc*) depends="$pkgname powerpc-utils" + esac 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/ -} - mount() { pkgdesc="Utility to mount filesystems using GRUB modules" depends="$pkgname" @@ -181,11 +182,19 @@ mount() { mv "$pkgdir"/usr/bin/grub-mount "$subpkgdir"/usr/bin/ } -sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb grub-2.04.tar.xz +sha512sums="6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb grub-2.12~rc1.tar.xz 4a6c909a1150b057fb0563f7a0646db33e16f84d6a8c443ef7db4003efd56c211a52f87699c5c95a6ccde65f6db46a8711a5b784f38479db804938dfe3115439 adelie-branding.patch -f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288 fix-gcc-no-pie-specs.patch 6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41 grub2-accept-empty-module.patch -bca0f23e73bfa09108bbf7b8ee12635051122e0a1f0db7d8a7d53727ba7d8f45b76a70a04c070e900109cd2baf97fcaf01a07208d45597ed1c390d5cf63ba9cd fix-deprecated-fgrep-usage.patch +de798c8907ab5c3f00b42bf10a63a5666af2076932a46ec6e484c67303bef0509e7787910392f75b3e4ccb9aa17d67f2ef5f5fc1eed3dcdf96f598dc2400ade4 0001-unmerged-usr.patch +60e299ef0677dbd4e1e60623353be3dd8fbb1a795cbf24a9e1a2511f6a7322033254daf71116e95e93335d5e76a7a85488d66f357779a9f589f04119df8f0aea 0002-revert-gawk.patch +d7f22e5f02dfbebad5e9122a01a9d6e5fffd0bb4731790c97e5184c148a5e1e8f4d5d3d49b09b26a7768648b147b134c3b316649608d2ac8390ab63b7f278a07 0003-spcr-revision.patch +1daba1b4857c45f4e729d24cd800eb6f6b659ea5c8399394487f75817b4f7092e5972676fc8c28b6289e04f0fe41d4ca54dc4523db1393cdb65751d377a06d8a 0004-videoinfo-no-reinit.patch +0a69b2f9cb178b8ae4a7b96f1cb801ef6d6d7942a842346de5017b6fdb5a8bd6db1ad55fdd9cc41a6c4660be9985621008d1da1dc45510d6ffed425f0f4997d1 0005-vsnprintf.patch +9b444c596c3c7387c18f3d6747ce4000d8e1ac89a07d919f3c648b07a3492911a6b7a84764c7f953a8a7873f26dedf10549a46008bc23e38d1da3eeb6d1850e3 0006-cryptodisk-retval.patch +a16569a037b29a669d5bd68f6130b1c59870f8bb660bf98b318f0dac39bb9a0026d76e2d47298e2b22a91f75aa34c234785149b61e699dfdde27020210023e84 0007-efi_gop-shadow.patch +13a819813b82ed13752dff2bf2ddaf47e1c369f10148a988a2517d51f33c11ee187f3c6909c08a1b922440aebebe1f3178fe8f63f85055129b74893885e0db1f 0008-efi-pure64.patch +911a28fa28f966369039e14062deaf90c81818c06fb3f44add27c395a3074b8c1b858a47c1a97909e07b813a87633bf244e5ee4db23f9d429edd9a05f5b5d72a 0009-linux-mixed-mode.patch +1552f56c17c55aabae26c64beeb9ed507623331794d4b590721fa0f22b658831bbef3475dfb8c125ab05e8ec62939d5928416c32d2c968a4a2a98bee0744c1fd 0010-fix-gcc-no-pie-specs.patch 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4 grub-xen-host_grub.cfg 1cb675fa0af9a1fd8d1a868e3e9de3bfef7eada66c5df0cfef23eca33e93e676eed6e1f67c679690f3e581565b350a9f3ba01aa9b89de66c970ea61ca21bcd65 default-grub 8e5f1cf91da9fd956695438509bb26e45f38170ca90d99a996e859053d72c82b7e4b02cb8979f047fc53498036f47b5400bf54687c390793995a05ded4216d55 update-grub -- cgit v1.2.3-60-g2f50