grub: build update

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

.github/workflows/grub.yml

@@ -28,13 +28,12 @@ jobs:
           sudo timedatectl set-timezone "Europe/Berlin"
 
           sudo apt update
-          sudo apt install -y autoconf automake autopoint build-essential pkg-config bison flex gettext gawk libtool dosfstools e2fsprogs
-          sudo apt install -y libfreetype6-dev unifont fonts-dejavu libfuse-dev libzfslinux-dev liblzma-dev libdevmapper-dev
+          sudo apt install -y build-essential autoconf automake autopoint pkg-config bison flex gettext gawk libtool dosfstools e2fsprogs libfreetype6-dev unifont fonts-dejavu libfuse-dev libzfslinux-dev liblzma-dev zlib1g-dev libdevmapper-dev libssl-dev
 
       - name: Make Grub
         run: |
           rm -f "files/initrd/opt/arc/grub.img.gz"
-          . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi" "ARC"
+          . scripts/grub.sh "grub-2.14" "i386-pc i386-efi x86_64-efi" "ARC"
 
       - name: Check and Push
         if: success() && inputs.push == true

scripts/grub.sh

@@ -7,7 +7,7 @@
 #
 
 # Variables
-GRUB=${1:-"grub-2.12"}
+GRUB=${1:-"grub-2.14"}
 BIOS=${2:-"i386-pc i386-efi x86_64-efi"}
 NAME=${3:-"ARC"}
 GRUB_URL="https://ftp.gnu.org/gnu/grub/${GRUB}.tar.gz"
@@ -26,17 +26,25 @@ for B in ${BIOS}; do
   echo "Building for ${b[@]}..."
   mkdir -p "${B}"
   pushd "${B}" > /dev/null
+  
+  # Ensure grub-core/extra_deps.lst exists in this build dir so 'make install' finds it
+  if [[ -f ../grub-core/extra_deps.lst ]]; then
+    mkdir -p grub-core
+    cp ../grub-core/extra_deps.lst grub-core/extra_deps.lst
+  fi
+  
   ../configure --prefix="$PWD/usr" --sbindir="$PWD/sbin" --sysconfdir="$PWD/etc" \
     --disable-werror --target="${b[0]}" --with-platform="${b[1]}"
+
   make -j$(nproc)
   make install
 
   # Remove locale files if generated
-  LOCALE_DIR="$PWD/usr/share/locale"
-  if [[ -d "${LOCALE_DIR}" ]]; then
-    echo "Removing locale files..."
-    rm -rf "${LOCALE_DIR}"
-  fi
+  #LOCALE_DIR="$PWD/usr/share/locale"
+  #if [[ -d "${LOCALE_DIR}" ]]; then
+  #  echo "Removing locale files..."
+  #  rm -rf "${LOCALE_DIR}"
+  #fi
 
   popd > /dev/null
 done