Alexander/grub-luks2-improved-stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert a problematic commit

Browse Source
This commit is contained in:
Christian Hesse 2022-08-26 17:34:02 +00:00
parent 1155d57717
commit 7e7a27c50b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PKGBUILD
View File

@ -22,7 +22,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=2
url='https://www.gnu.org/software/grub/' url='https://www.gnu.org/software/grub/'
arch=('x86_64') arch=('x86_64')
license=('GPL3') license=('GPL3')
@ -77,6 +77,11 @@ sha256sums=('SKIP'
_backports=( _backports=(
) )
_reverts=(
# efi: Don't display a uefi-firmware entry if it's not supported
'26031d3b101648352e4e427f04bf69d320088e77'
)
_configure_options=( _configure_options=(
PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}" PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}"
FREETYPE="pkg-config freetype2" FREETYPE="pkg-config freetype2"
@ -111,6 +116,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"