514d26f6eb
1) Removal of archlinux_grub_mkconfig_fixes.patch, replaced with 10_archlinux helper script, and grub-add-GRUB_COLOR_variables.patch (small non-Arch specific part of the earlier patch). Fixes https://bugs.archlinux.org/task/37904 . 2) Bump directly used unifont bdf file to working ver 6.3.20131217 as mentioned at http://savannah.gnu.org/bugs/?40330 3) grub-extras is now available as GIT repo, so removed bzr from makedepends. As a consequence removed python2 and used python(3) in makedepends. Incorrect GRUB_CONTRIB var also fixed. 4) grub-extras LUA and ntldr-img are set to be deprecated, so they are not built. The only grub-extras version built is 915resolution (for grub-bios aka target i386-pc alone) 5) PKGBUILD directly used GIT TAG support by makepkg to checkout the souce instead of downloading the upstream tarball 6) https://bugs.archlinux.org/task/38054 already fixed in 2.02-beta1. 7) https://bugs.archlinux.org/task/38053 also fixed in 2.02-beta1. I personally never experienced this issue so cannot comment on this 8) Added suffix grub-efi build dir so that it is easy for users to modify the PKGBUILD to build i386-efi in Arch x86_64 if required (not officially supported).
33 lines
852 B
Diff
33 lines
852 B
Diff
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
|
index 3390ba9..c416489 100644
|
|
--- a/util/grub-mkconfig.in
|
|
+++ b/util/grub-mkconfig.in
|
|
@@ -218,6 +218,8 @@ export GRUB_DEFAULT \
|
|
GRUB_THEME \
|
|
GRUB_GFXPAYLOAD_LINUX \
|
|
GRUB_DISABLE_OS_PROBER \
|
|
+ GRUB_COLOR_NORMAL \
|
|
+ GRUB_COLOR_HIGHLIGHT \
|
|
GRUB_INIT_TUNE \
|
|
GRUB_SAVEDEFAULT \
|
|
GRUB_ENABLE_CRYPTODISK \
|
|
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
|
index d2e7252..8259f45 100644
|
|
--- a/util/grub.d/00_header.in
|
|
+++ b/util/grub.d/00_header.in
|
|
@@ -125,6 +125,14 @@ cat <<EOF
|
|
|
|
EOF
|
|
|
|
+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
|
|
+ cat << EOF
|
|
+set menu_color_normal=$GRUB_COLOR_NORMAL
|
|
+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
|
|
+
|
|
+EOF
|
|
+fi
|
|
+
|
|
serial=0;
|
|
gfxterm=0;
|
|
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
|