From 70527c416cc68f9b67c4f697a38bbd70278f9385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Fri, 10 Dec 2021 17:37:31 +0000
Subject: [PATCH] Fix apply changes to right grub2 version

---
 helpers/config     | 6 +++++-
 helpers/make-grub2 | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/helpers/config b/helpers/config
index 0611d23..dbf6642 100755
--- a/helpers/config
+++ b/helpers/config
@@ -153,7 +153,11 @@ cd PACKAGES/$PACKAGE
 
 #Get package and uncompress it
 apt-get update -c $LOCAL_APT/etc/apt.conf
-apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf
+if [ -n "$FIXED_VER" ]; then
+  apt-get source $PACKAGE=$FIXED_VER --download-only -c ${LOCAL_APT}/etc/apt.conf
+else
+  apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf
+fi
 # Verify it first
 if grep -q "BEGIN PGP SIGNATURE" *.dsc; then
   KEY=$(gpg2 --keyid-format 0xlong --verify  *.dsc  2>&1 | grep 0x | sed 's/.*0x//' || true)
diff --git a/helpers/make-grub2 b/helpers/make-grub2
index c0ae9e3..ff11fe6 100644
--- a/helpers/make-grub2
+++ b/helpers/make-grub2
@@ -20,6 +20,7 @@
 #
 
 VERSION=5
+FIXED_VER=2.04-1ubuntu26.13
 COMPONENT=main
 
 . ./config
@@ -50,9 +51,6 @@ replace Ubuntu Trisquel .
 replace ubuntu trisquel .
 find |grep ubuntu|xargs rename s/ubuntu/trisquel/
 
-#Avoid the use of signed grub efi package
-sed -i '/Recommends:/s|grub-efi-amd64-signed|grub-efi-amd64|' debian/control
-
 # Allow Windows and MacOX entries to boot without a password
 sed 's/class osx/class osx --unrestricted/; s/class windows/class osx --unrestricted/;' -i ./util/grub.d/30_os-prober.in
 
@@ -61,4 +59,3 @@ sed -i '/set -e/aexit 77' tests/grub_cmd_set_date.in
 changelog "skip test grub_cmd_set_date.in"
 
 compile
-