diff --git a/0003-support-dropins-for-default-configuration.patch b/0003-support-dropins-for-default-configuration.patch new file mode 100644 index 0000000..4840487 --- /dev/null +++ b/0003-support-dropins-for-default-configuration.patch @@ -0,0 +1,28 @@ +From ac560966d09295663fa9516d8d137e0c0fd04c06 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Mon, 12 Jun 2023 07:42:01 +0200 +Subject: [PATCH 1/1] support dropins for default configuration + +--- + util/grub-mkconfig.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 1a945085c..4338dceef 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -160,6 +160,11 @@ fi + if test -f ${sysconfdir}/default/grub ; then + . ${sysconfdir}/default/grub + fi ++for dropin in ${sysconfdir}/default/grub.d/*.cfg ; do ++ if test -f "${dropin}" ; then ++ . "${dropin}" ++ fi ++done + + if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then + if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then +-- +2.41.0 + diff --git a/PKGBUILD b/PKGBUILD index 9f9e171..d84f910 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,9 +18,9 @@ _GRUB_EMU_BUILD="0" pkgname='grub' pkgdesc='GNU GRand Unified Bootloader (2)' epoch=2 -_commit='e67a551a48192a04ab705fca832d82f850162b64' -_pkgver=2.06.r499.ge67a551a4 -_unifont_ver='15.0.02' +_commit='c016a969d1eb59701face9ba14c19d67540f7037' +_pkgver=2.06.r557.gac560966d +_unifont_ver='15.0.06' pkgver=${_pkgver/-/} pkgrel=1 url='https://www.gnu.org/software/grub/' @@ -62,15 +62,17 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}" "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} '0001-00_header-add-GRUB_COLOR_-variables.patch' '0002-10_linux-detect-archlinux-initramfs.patch' + '0003-support-dropins-for-default-configuration.patch' 'grub.default' 'sbat.csv') sha256sums=('SKIP' 'SKIP' - '0c4c0c29271b019fdadc2e354e2f1dccf03b171c7c7ebf7e1378285c36f8280d' + '93cb54fa103a00e25cd3e16550b4b4eb13cbd098e515679ade3ae82cd0739f29' 'SKIP' '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d' + 'b5d9fcd62ffb3c3950fdeb7089ec2dc2294ac52e9861980ad90a437dedbd3d47' '7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb' '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df') @@ -127,6 +129,9 @@ prepare() { echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..." patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch" + echo "Patch to support dropins for default configuration..." + patch -Np1 -i "${srcdir}/0003-support-dropins-for-default-configuration.patch" + 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"