summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLlewelyn Trahaearn2019-04-01 16:05:56 -0700
committerLlewelyn Trahaearn2019-04-01 16:05:56 -0700
commitd0e2de860d48a107c5814ee07356c77daee06673 (patch)
treef92ec4699574d2d476d24f36178e3a00f53597d8
parent01d82de24a1be0128d385523f29b8018b976c8d2 (diff)
downloadaur-d0e2de860d48a107c5814ee07356c77daee06673.tar.gz
Update PKGBUILD to accommodate changes in upstream commit 35b909062e7b334eb4af372be3260d0f62d85375
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD11
-rw-r--r--grub.default6
3 files changed, 14 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c3728429050..a0dabf1d9d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = grub-git
pkgdesc = GNU GRand Unified Bootloader (2)
- pkgver = 2.02.r241.ged087f046
+ pkgver = 2.02.r304.g63d568ed2
pkgrel = 1
url = https://www.gnu.org/software/grub/
install = grub-git.install
@@ -33,14 +33,16 @@ pkgbase = grub-git
backup = etc/grub.d/40_custom
source = grub::git://git.savannah.gnu.org/grub.git
source = grub-extras::git://git.savannah.gnu.org/grub-extras.git
+ source = gnulib::git://git.sv.gnu.org/gnulib.git
source = 10_linux-detect-archlinux-initramfs.patch
source = add-GRUB_COLOR_variables.patch
source = grub.default
sha256sums = SKIP
sha256sums = SKIP
+ sha256sums = SKIP
sha256sums = b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3
sha256sums = a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29
- sha256sums = 74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82
+ sha256sums = 9ca2414266fadd0b1aafc850c1c26a48760fbc95f1913ab8b36f1e54483b31fd
pkgname = grub-git
diff --git a/PKGBUILD b/PKGBUILD
index 39652a8cf74..5df180c0f48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ _build_platforms="i386-pc ${_target_arch}-efi"
[[ "${_grub_emu_build}" == "1" ]] && _build_platforms+=" ${_target_arch}-emu"
pkgname="grub-git"
-pkgver=2.02.r241.ged087f046
+pkgver=2.02.r304.g63d568ed2
pkgrel=1
pkgdesc="GNU GRand Unified Bootloader (2)"
arch=('x86_64' 'i686')
@@ -45,14 +45,16 @@ backup=('etc/default/grub'
install="${pkgname}.install"
source=("grub::git://git.savannah.gnu.org/grub.git"
"grub-extras::git://git.savannah.gnu.org/grub-extras.git"
+ "gnulib::git://git.sv.gnu.org/gnulib.git"
'10_linux-detect-archlinux-initramfs.patch'
'add-GRUB_COLOR_variables.patch'
'grub.default')
sha256sums=('SKIP'
'SKIP'
+ 'SKIP'
'b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
- '74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82')
+ '9ca2414266fadd0b1aafc850c1c26a48760fbc95f1913ab8b36f1e54483b31fd')
prepare() {
cd grub
@@ -89,7 +91,8 @@ pkgver() {
build() {
cd grub
export GRUB_CONTRIB="$srcdir"/grub-extras
- ./autogen.sh
+ export GNULIB_SRCDIR="$srcdir"/gnulib
+ ./bootstrap
# Undefined references to __stack_chk_fail
CFLAGS=${CFLAGS/-fstack-protector-strong}
@@ -139,4 +142,4 @@ package() {
-name 'kernel.exec' -o \
-name 'gdb_grub' -o \
-name 'gmodule.pl' \) -delete
-} \ No newline at end of file
+}
diff --git a/grub.default b/grub.default
index a521de42503..1f32906f13f 100644
--- a/grub.default
+++ b/grub.default
@@ -12,9 +12,9 @@ GRUB_PRELOAD_MODULES="part_gpt part_msdos"
# Uncomment to enable booting from LUKS encrypted devices
#GRUB_ENABLE_CRYPTODISK=y
-# Uncomment to enable Hidden Menu, and optionally hide the timeout count
-#GRUB_HIDDEN_TIMEOUT=5
-#GRUB_HIDDEN_TIMEOUT_QUIET=true
+# Set to 'countdown' or 'hidden' to change timeout behavior,
+# press ESC key to display menu.
+GRUB_TIMEOUT_STYLE=menu
# Uncomment to use basic console
GRUB_TERMINAL_INPUT=console