From e9d44d1d4c4e4b5e7aa10de2293ca690e9bfc0a7 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Fri, 2 Sep 2022 15:23:20 +0300
Subject: [PATCH] grub2 rebuild

---
 system/boot/grub2/actions.py                | 33 +++++++++++----------
 system/boot/grub2/files/grub-mkconfig.patch | 12 ++++++++
 system/boot/grub2/files/update-grub         |  2 +-
 system/boot/grub2/pspec.xml                 | 10 +++----
 4 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 system/boot/grub2/files/grub-mkconfig.patch

diff --git a/system/boot/grub2/actions.py b/system/boot/grub2/actions.py
index 876e0681..de4549be 100644
--- a/system/boot/grub2/actions.py
+++ b/system/boot/grub2/actions.py
@@ -13,7 +13,6 @@ from pisi.actionsapi import shelltools
 
 
 def setup():
-    
     shelltools.copy("../unifont*.bdf", "./unifont.bdf")
     #shelltools.export("GRUB_CONTRIB", "%s/grub-2.06/grub-extras" % (get.workDIR()))
 
@@ -21,10 +20,13 @@ def setup():
     pisitools.cflags.sub("\s?(-O[\ds]|-D_FORTIFY_SOURCE=\d)\s?", " ")
 
     #pisitools.dosed('util/grub-mkconfig.in', 'GRUB_DISABLE_OS_PROBER="true"', 'GRUB_DISABLE_OS_PROBER="false"')
-    shelltools.system("./linguas.sh")
-    shelltools.system("./bootstrap")
-    shelltools.system('echo "Make translations reproducible..."')
-    shelltools.system("sed -i '1i /^PO-Revision-Date:/ d' po/*.sed")
+    #shelltools.system("./linguas.sh")
+    #shelltools.system("./bootstrap")
+    #shelltools.system('echo "Make translations reproducible..."')
+    #shelltools.system("sed -i '1i /^PO-Revision-Date:/ d' po/*.sed")
+    shelltools.copytree("../grub-%s" % (get.srcVERSION().replace("_", "~")), "../grub-%s-efi" % get.srcVERSION())
+
+    autotools.autoreconf("-fi")
 
     autotools.configure("--disable-werror \
                          --with-bootdir='/boot' \
@@ -34,11 +36,12 @@ def setup():
                          --with-platform=pc \
                          --target='i386' \
                          --htmldir='/usr/share/doc/grub2/html' ")
-    
-    
-    shelltools.copytree("../grub-%s" % (get.srcVERSION().replace("_", "~")), "../grub-%s-efi" % get.srcVERSION())
+
+
     shelltools.cd("../grub-%s-efi" % get.srcVERSION())
-    shelltools.system("./bootstrap")
+    #shelltools.system("./autogen.sh")
+
+    autotools.autoreconf("-fi")
     autotools.configure("--disable-werror \
                          --with-bootdir='/boot' \
                          --with-grubdir=grub2 \
@@ -47,27 +50,27 @@ def setup():
                          --with-platform=efi \
                          --target=x86_64  \
                          --htmldir='/usr/share/doc/grub2/html' ")
-    
-    
+
+
     shelltools.cd("..")
 
-    
+
 def build():
     #make-dist for creating all updated translation files
     #autotools.make("dist")
     autotools.make()
-    
+
     shelltools.cd("../grub-%s-efi" % get.srcVERSION())
     autotools.make()
     shelltools.cd("..")
 
 def install():
-    # Install unicode.pf2 using downloaded font source. 
+    # Install unicode.pf2 using downloaded font source.
     #shelltools.system("./grub-mkfont -o unicode.pf2 unifont.bdf")
 
     # Create directory for grub.cfg file
     #pisitools.dodir("/boot/grub2")
-    
+
     #pisitools.insinto("/boot/grub2", "unicode.pf2")
 
     # Insall our theme
diff --git a/system/boot/grub2/files/grub-mkconfig.patch b/system/boot/grub2/files/grub-mkconfig.patch
new file mode 100644
index 00000000..eecb1d80
--- /dev/null
+++ b/system/boot/grub2/files/grub-mkconfig.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+--- a/util/grub-mkconfig.in	2022-09-01 22:32:28.455672599 +0300
++++ b/util/grub-mkconfig.in	2022-09-01 22:32:49.527671079 +0300
+@@ -1,6 +1,8 @@
+ #! /bin/sh
+ set -e
+ 
++export LC_ALL=C
++
+ # Generate grub.cfg by inspecting /boot contents.
+ # Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
+ #
diff --git a/system/boot/grub2/files/update-grub b/system/boot/grub2/files/update-grub
index 02e7d32a..8834e52d 100644
--- a/system/boot/grub2/files/update-grub
+++ b/system/boot/grub2/files/update-grub
@@ -1,3 +1,3 @@
 #! /bin/sh
-export LC_ALL=C
+# export LC_ALL=C
 grub2-mkconfig -o /boot/grub2/grub.cfg
diff --git a/system/boot/grub2/pspec.xml b/system/boot/grub2/pspec.xml
index 16ad6e2a..c6c31ff9 100644
--- a/system/boot/grub2/pspec.xml
+++ b/system/boot/grub2/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:gui</IsA>
         <Summary>GNU GRUB is a Multiboot boot loader.</Summary>
         <Description>GNU GRUB (short for GNU GRand Unified Bootloader) is a boot loader package from the GNU Project.</Description>
-        <Archive sha1sum="aa62465ad119a328662af87c969a3e7ca1f81e1d" type="zip">https://sourceforge.net/projects/pisilinux/files/source/grub-2.06.zip</Archive>
+        <Archive sha1sum="c9f93f1e195ec7a5a21d36a13b469788c0b29f0f" type="tarxz">https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz</Archive>
 <!--         <Archive sha1sum="4ec712aced1c2b4cb6cd1cbd83fc2154249d6977" type="tarxz" target="grub-2.06/grub-extras">https://sourceforge.net/projects/pisilinux/files/source/grub2_extras_915resolution_r10.tar.xz</Archive> -->
         <Archive sha1sum="c22f624573ee2c81c54324943e4d6c4a3a8b5cdc" type="gz">https://ftp.gnu.org/gnu/unifont/unifont-13.0.06/unifont-13.0.06.bdf.gz</Archive>
 <!--         <Archive sha1sum="30797ba7a86fc32213b9ae994c9fa45f37d01170" type="gz">http://ftp.gnu.org/gnu/unifont/unifont-6.3.20131217/unifont-6.3.20131217.bdf.gz</Archive> -->
@@ -44,9 +44,9 @@
             <Package>grub</Package>
         </Replaces>
         <Patches>
-            <Patch level="1">gfxpayload.patch</Patch> -->
-            <Patch level="1">grub-2.02_beta2-KERNEL_GLOBS.patch</Patch> -->
-<!--             <Patch level="1">mkconfig-fix.patch</Patch> -->
+            <Patch level="1">gfxpayload.patch</Patch>
+            <Patch level="1">grub-2.02_beta2-KERNEL_GLOBS.patch</Patch>
+            <Patch level="1">grub-mkconfig.patch</Patch>
             <Patch>pisi_name_and_initramfs.patch</Patch>
 
             <Patch level="1">grub-2.06-test-words.patch</Patch>
@@ -112,7 +112,7 @@
 
     <History>
         <Update release="24">
-            <Date>2022-08-13</Date>
+            <Date>2022-09-02</Date>
             <Version>2.06</Version>
             <Comment>Rebuild.</Comment>
             <Name>Mustafa Cinasal</Name>