[arch-commits] Commit in grub/trunk (PKGBUILD)

[Christian Hesse]

    Date: Friday, August 26, 2022 @ 17:34:02
  Author: eworm
Revision: 454553

upgpkg: grub 2:2.06.r322.gd9b4638c5-2: revert a problematic commit

Modified:
  grub/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-26 17:00:17 UTC (rev 454552)
+++ PKGBUILD	2022-08-26 17:34:02 UTC (rev 454553)
@@ -22,7 +22,7 @@
 _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 @@
 _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 @@
 		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"