core/grub to 2.06.r322.gd9b4638c5-3

This commit is contained in:
Kevin Mihelich 2022-08-31 00:08:22 +00:00
parent 0f746e6a30
commit fc96429595
2 changed files with 24 additions and 4 deletions

View file

@ -33,7 +33,7 @@ _commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc'
_pkgver=2.06.r322.gd9b4638c5 _pkgver=2.06.r322.gd9b4638c5
_unifont_ver='14.0.04' _unifont_ver='14.0.04'
pkgver=${_pkgver/-/} pkgver=${_pkgver/-/}
pkgrel=1 pkgrel=3
url='https://www.gnu.org/software/grub/' url='https://www.gnu.org/software/grub/'
arch=('x86_64') arch=('x86_64')
license=('GPL3') license=('GPL3')
@ -92,6 +92,9 @@ sha256sums=('SKIP'
_backports=( _backports=(
) )
_reverts=(
)
_configure_options=( _configure_options=(
PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}" PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}"
FREETYPE="pkg-config freetype2" FREETYPE="pkg-config freetype2"
@ -126,6 +129,13 @@ prepare() {
git cherry-pick -n "${_c}" git cherry-pick -n "${_c}"
done done
echo "Apply reverts..."
local _c
for _c in "${_reverts[@]}"; do
git log --oneline -1 "${_c}"
git revert -n "${_c}"
done
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}/0001-00_header-add-GRUB_COLOR_-variables.patch" patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"

View file

@ -7,6 +7,16 @@ post_upgrade() {
mv /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg mv /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
fi fi
# Give a hint to update installation and configuration one after another.
cat <<EOM
:: To use the new features provided in this GRUB update, it is recommended
to install it to the MBR or UEFI. Due to potential configuration
incompatibilities, it is advised to run both, installation and generation
of configuration:
\$ grub-install ...
\$ grub-mkconfig -o /boot/grub/grub.cfg
EOM
# return if old package version greater 2:2.06-0... # return if old package version greater 2:2.06-0...
(( $(vercmp $2 '2:2.06-0') > 0 )) && return (( $(vercmp $2 '2:2.06-0') > 0 )) && return
@ -21,8 +31,8 @@ EOM
post_install() { post_install() {
cat <<EOM cat <<EOM
:: Generate your bootloader configuration with: :: Install your bootloader and generate configuration with:
grub-mkconfig -o /boot/grub/grub.cfg \$ grub-install ...
\$ grub-mkconfig -o /boot/grub/grub.cfg
EOM EOM
} }