From 7e7a27c50b0093fef04bd9924b70b0ae2bf9d833 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 26 Aug 2022 17:34:02 +0000 Subject: [PATCH] revert a problematic commit --- PKGBUILD | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index f39dd2b..aab5786 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,7 +22,7 @@ _commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc' _pkgver=2.06.r322.gd9b4638c5 _unifont_ver='14.0.04' pkgver=${_pkgver/-/} -pkgrel=1 +pkgrel=2 url='https://www.gnu.org/software/grub/' arch=('x86_64') license=('GPL3') @@ -77,6 +77,11 @@ sha256sums=('SKIP' _backports=( ) +_reverts=( + # efi: Don't display a uefi-firmware entry if it's not supported + '26031d3b101648352e4e427f04bf69d320088e77' +) + _configure_options=( PACKAGE_VERSION="${epoch}:${pkgver}-${pkgrel}" FREETYPE="pkg-config freetype2" @@ -111,6 +116,13 @@ prepare() { git cherry-pick -n "${_c}" 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..." ## 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"