From 359faf61b8d720950095c83de6545767691aec77 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Sun, 27 Nov 2016 18:31:31 +0000
Subject: [PATCH] Updated grub2 for flidas build

---
 helpers/config     |  1 +
 helpers/make-grub2 | 14 +++-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/helpers/config b/helpers/config
index c74d5262..298c4fcc 100755
--- a/helpers/config
+++ b/helpers/config
@@ -55,6 +55,7 @@ find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execd
 }
 changelog(){
 head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME
+PKGVERSION=$(dpkg-parsechangelog --show-field Version)
 echo | dch -D $REPO -v ${PKGVERSION}+${REVISION}trisquel${VERSION} "$1"
 
 # Make sure the changelog file is identical between archs
diff --git a/helpers/make-grub2 b/helpers/make-grub2
index 81d07e0d..80b44015 100644
--- a/helpers/make-grub2
+++ b/helpers/make-grub2
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2011  Rubén Rodríguez <ruben@trisquel.info>
+#    Copyright (C) 2011-2016  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=5
+VERSION=1
 COMPONENT=main
 
 . ./config
@@ -31,7 +31,7 @@ for i in install_efi_ubuntu_flavours.patch mkconfig_ubuntu_distributor.patch; do
 done
 
 #Allow passwords https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1311302
-sed '/^CLASS/s/class os/class os --unrestricted/' -i util/grub.d/10_linux.in
+/bin/sed '/CLASS=/s/class os/class os --unrestricted/' -i util/grub.d/* debian/patches/mkconfig_other_inits.patch
 
 replace "with Linux" "with Linux-Libre" util
 replace "with Linux" "with Linux-Libre" debian
@@ -40,8 +40,6 @@ replace Ubuntu Trisquel .
 replace ubuntu trisquel .
 find |grep ubuntu|xargs rename s/ubuntu/trisquel/
 
-#sed 's/\(prefix=@prefix@\)/\1\nGRUB_CMDLINE_EXTRA=$( grep -q nomodeset \/proc\/cmdline \&\& echo nomodeset \|\| echo -n "" )/' util/grub.d/10_linux.in -i
-
 cat << EOF >> debian/default/grub
 
 # Trisquel comes without kernel recovery entries to improve security.
@@ -50,19 +48,13 @@ EOF
 
 GRUBVERSION=$(head -n1 debian/changelog |/bin/sed 's/.*(//;s/).*//; s/[~+-].*//')
 
-echo $GRUBVERSION 
 echo /bin/sed "/GNU GRUB  version/ s/PACKAGE_VERSION/\"$GRUBVERSION\"/" -i grub-core/normal/main.c
 /bin/sed "/GNU GRUB  version/ s/PACKAGE_VERSION/\"$GRUBVERSION\"/" -i grub-core/normal/main.c
 
 changelog "Disable rescue mode by default, branding"
-#sed "s/-.*)/-${REVISION}trisquel${VERSION})/" -i debian/changelog
 
 # 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
 
-#apt-get install -y --force-yes kvm-pxe
-# /dev is needed for KVM support
-#mount none -t devtmpfs /dev || true
 compile
-#umount /dev
 
-- 
GitLab