new upstream commits

This commit is contained in:
Christian Hesse 2021-03-10 18:01:54 +00:00
parent 1a7eab23c1
commit fa9d34525f
3 changed files with 43 additions and 26 deletions

View File

@ -1,18 +1,27 @@
From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 10 Mar 2021 18:42:25 +0100
Subject: [PATCH] 00_header: add GRUB_COLOR_* variables
---
util/grub-mkconfig.in | 2 ++
util/grub.d/00_header.in | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 3390ba9..c416489 100644 index f8cbb8d7a..1189d95f9 100644
--- a/util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -218,6 +218,8 @@ export GRUB_DEFAULT \ @@ -246,6 +246,8 @@ export GRUB_DEFAULT \
GRUB_BACKGROUND \
GRUB_THEME \ GRUB_THEME \
GRUB_GFXPAYLOAD_LINUX \ GRUB_GFXPAYLOAD_LINUX \
GRUB_DISABLE_OS_PROBER \ + GRUB_COLOR_NORMAL \
+ GRUB_COLOR_NORMAL \
+ GRUB_COLOR_HIGHLIGHT \ + GRUB_COLOR_HIGHLIGHT \
GRUB_INIT_TUNE \ GRUB_INIT_TUNE \
GRUB_SAVEDEFAULT \ GRUB_SAVEDEFAULT \
GRUB_ENABLE_CRYPTODISK \ GRUB_ENABLE_CRYPTODISK \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index d2e7252..8259f45 100644 index 93a90233e..c5955df00 100644
--- a/util/grub.d/00_header.in --- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in
@@ -125,6 +125,14 @@ cat <<EOF @@ -125,6 +125,14 @@ cat <<EOF

View File

@ -1,8 +1,16 @@
From 058d08a025f9a6ec77d5ddd1fc62c7bd6abe1a52 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 10 Mar 2021 18:40:00 +0100
Subject: [PATCH] 10_linux: detect archlinux initramfs
---
util/grub.d/10_linux.in | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index f5d3e78..ef59c8c 100644 index e8b01c0d0..e703dcdb0 100644
--- a/util/grub.d/10_linux.in --- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in
@@ -83,6 +83,8 @@ linux_entry () @@ -93,6 +93,8 @@ linux_entry ()
case $type in case $type in
recovery) recovery)
title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
@ -11,7 +19,7 @@ index f5d3e78..ef59c8c 100644
*) *)
title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
esac esac
@@ -186,7 +188,7 @@ while [ "x$list" != "x" ] ; do @@ -198,7 +200,7 @@ while [ "x$list" != "x" ] ; do
basename=`basename $linux` basename=`basename $linux`
dirname=`dirname $linux` dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname` rel_dirname=`make_system_path_relative_to_its_root $dirname`
@ -20,7 +28,7 @@ index f5d3e78..ef59c8c 100644
alt_version=`echo $version | sed -e "s,\.old$,,g"` alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
@@ -248,6 +250,18 @@ while [ "x$list" != "x" ] ; do @@ -285,6 +287,18 @@ while [ "x$list" != "x" ] ; do
linux_entry "${OS}" "${version}" advanced \ linux_entry "${OS}" "${version}" advanced \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"

View File

@ -9,21 +9,21 @@ _IA32_EFI_IN_ARCH_X64="1"
## "1" to enable EMU build, "0" to disable ## "1" to enable EMU build, "0" to disable
_GRUB_EMU_BUILD="0" _GRUB_EMU_BUILD="0"
_GRUB_EXTRAS_COMMIT="8a245d5c1800627af4cefa99162a89c7a46d8842" _GRUB_EXTRAS_COMMIT='8a245d5c1800627af4cefa99162a89c7a46d8842'
_GNULIB_COMMIT="be584c56eb1311606e5ea1a36363b97bddb6eed3" _GNULIB_COMMIT='be584c56eb1311606e5ea1a36363b97bddb6eed3'
_UNIFONT_VER="13.0.06" _UNIFONT_VER='13.0.06'
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" [[ "${CARCH}" == 'x86_64' ]] && _EFI_ARCH='x86_64'
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" [[ "${CARCH}" == 'i686' ]] && _EFI_ARCH='i386'
[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64" [[ "${CARCH}" == 'x86_64' ]] && _EMU_ARCH='x86_64'
[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386" [[ "${CARCH}" == 'i686' ]] && _EMU_ARCH='i386'
pkgname='grub' pkgname='grub'
pkgdesc='GNU GRand Unified Bootloader (2)' pkgdesc='GNU GRand Unified Bootloader (2)'
epoch=2 epoch=2
_commit='8fcfd1e0fc72d58766ce3dc09cf883c032f063f6' _commit='39cfb3eb5caa71967f4e9e741d859e15d645c32f'
_pkgver=2.04.r340.g8fcfd1e0f _pkgver=2.04.r358.g39cfb3eb5
pkgver=${_pkgver/-/} pkgver=${_pkgver/-/}
pkgrel=1 pkgrel=1
url='https://www.gnu.org/software/grub/' url='https://www.gnu.org/software/grub/'
@ -63,8 +63,8 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
"git+https://git.savannah.gnu.org/git/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}" "git+https://git.savannah.gnu.org/git/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
"git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_GNULIB_COMMIT}" "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_GNULIB_COMMIT}"
"https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig} "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
'0003-10_linux-detect-archlinux-initramfs.patch' '0001-00_header-add-GRUB_COLOR_-variables.patch'
'0004-add-GRUB_COLOR_variables.patch' '0002-10_linux-detect-archlinux-initramfs.patch'
'grub.default') 'grub.default')
sha256sums=('SKIP' sha256sums=('SKIP'
@ -72,8 +72,8 @@ sha256sums=('SKIP'
'SKIP' 'SKIP'
'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5' 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5'
'SKIP' 'SKIP'
'171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4' '5f2d7cde16e8edc34b613511e6abf2550b8de55bcc3039e5bfc3971164419093'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29' '580a81b00088773d554832b0d74c85bf16fec37728802973c45993bcb97cd7d5'
'791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206') '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
_backports=( _backports=(
@ -112,12 +112,12 @@ prepare() {
git cherry-pick -n "${_c}" git cherry-pick -n "${_c}"
done done
echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
patch -Np1 -i "${srcdir}/0003-10_linux-detect-archlinux-initramfs.patch"
echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..." echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch" patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..." echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac" sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"