diff options
author | Mike Swanson | 2021-06-13 11:32:07 -0700 |
---|---|---|
committer | Mike Swanson | 2021-06-13 11:32:07 -0700 |
commit | 0bd6092ac0d3d7e2ee1d34aa434162d4f1cfc3e3 (patch) | |
tree | 9be711030d49f9ada7323562b7e172107fabb050 | |
parent | 900fd9aed3f216a94975b96aaf576e47bb8a9d5f (diff) | |
download | aur-0bd6092ac0d3d7e2ee1d34aa434162d4f1cfc3e3.tar.gz |
Sync with core repo 2.04-10
I know some of you like to track the testing repo instead, but that’s
not my style.
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | grub.default | 5 |
3 files changed, 16 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = grub-libzfs pkgdesc = GNU GRand Unified Bootloader (2) - libzfs support pkgver = 2.04 - pkgrel = 8 + pkgrel = 10 epoch = 2 url = https://www.gnu.org/software/grub/ install = grub-libzfs.install @@ -53,8 +53,8 @@ pkgbase = grub-libzfs source = git+https://git.savannah.gnu.org/git/grub.git#tag=grub-2.04?signed source = git+https://git.savannah.gnu.org/git/grub-extras.git#commit=8a245d5c1800627af4cefa99162a89c7a46d8842 source = git+https://git.savannah.gnu.org/git/gnulib.git#commit=be584c56eb1311606e5ea1a36363b97bddb6eed3 - source = http://unifoundry.com/pub/unifont/unifont-13.0.05/font-builds/unifont-13.0.05.bdf.gz - source = http://unifoundry.com/pub/unifont/unifont-13.0.05/font-builds/unifont-13.0.05.bdf.gz.sig + source = http://unifoundry.com/pub/unifont/unifont-13.0.06/font-builds/unifont-13.0.06.bdf.gz + source = http://unifoundry.com/pub/unifont/unifont-13.0.06/font-builds/unifont-13.0.06.bdf.gz.sig source = 0003-10_linux-detect-archlinux-initramfs.patch source = 0004-add-GRUB_COLOR_variables.patch source = 0005-grub-install-fix-inverted-test-for-NLS-enabled-when-.patch @@ -66,13 +66,12 @@ pkgbase = grub-libzfs sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = c4e61e9336d8d024479ea72616722c6c47c93f76dc173e8ad3edf9f9e07c3115 + sha256sums = b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5 sha256sums = SKIP sha256sums = 171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4 sha256sums = a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29 sha256sums = 06820004912a3db195a76e68b376fce1ba6507ac740129f0b99257ef07aba1ea sha256sums = 55c559b6d8c4a832a43cc35c7635de37402ec9e3e3bfd8b2b7761a06f0bfda02 - sha256sums = 690adb7943ee9fedff578a9d482233925ca3ad3e5a50fffddd27cf33300a89e3 + sha256sums = 791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206 pkgname = grub-libzfs - @@ -11,7 +11,7 @@ _GRUB_EMU_BUILD="0" _GRUB_EXTRAS_COMMIT="8a245d5c1800627af4cefa99162a89c7a46d8842" _GNULIB_COMMIT="be584c56eb1311606e5ea1a36363b97bddb6eed3" -_UNIFONT_VER="13.0.05" +_UNIFONT_VER="13.0.06" [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" @@ -24,7 +24,7 @@ pkgdesc='GNU GRand Unified Bootloader (2) - libzfs support' epoch=2 _pkgver=2.04 pkgver=${_pkgver/-/} -pkgrel=8 +pkgrel=10 url='https://www.gnu.org/software/grub/' arch=('x86_64') license=('GPL3') @@ -71,17 +71,20 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signe sha256sums=('SKIP' 'SKIP' 'SKIP' - 'c4e61e9336d8d024479ea72616722c6c47c93f76dc173e8ad3edf9f9e07c3115' + 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5' 'SKIP' '171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4' 'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29' '06820004912a3db195a76e68b376fce1ba6507ac740129f0b99257ef07aba1ea' '55c559b6d8c4a832a43cc35c7635de37402ec9e3e3bfd8b2b7761a06f0bfda02' - '690adb7943ee9fedff578a9d482233925ca3ad3e5a50fffddd27cf33300a89e3') + '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206') _backports=( # grub-mkconfig: Use portable "command -v" to detect installed programs '28a7e597de0d5584f65e36f9588ff9041936e617' + + # build: Fix GRUB i386-pc build with Ubuntu gcc + '6643507ce30f775008e093580f0c9499dfb2c485' ) _configure_options=( diff --git a/grub.default b/grub.default index d6d41a91345c..6fd21c7fd223 100644 --- a/grub.default +++ b/grub.default @@ -51,4 +51,7 @@ GRUB_DISABLE_RECOVERY=true # Uncomment to make GRUB remember the last selection. This requires # setting 'GRUB_DEFAULT=saved' above. -#GRUB_SAVEDEFAULT="true" +#GRUB_SAVEDEFAULT=true + +# Uncomment to disable submenus in boot menu +#GRUB_DISABLE_SUBMENU=y |