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

[Tobias Powalowski]

    Date: Sunday, October 17, 2021 @ 16:07:28
  Author: tpowa
Revision: 426116

upgpkg: archboot-grub 2.06-3: add gpt and fat loading to initial grub config

Modified:
  archboot-grub/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-17 13:23:17 UTC (rev 426115)
+++ PKGBUILD	2021-10-17 16:07:28 UTC (rev 426116)
@@ -2,7 +2,7 @@
 
 pkgname=archboot-grub
 pkgver=2.06
-pkgrel=2
+pkgrel=3
 pkgdesc="grubx64.efi and grubia32.efi for archboot creation"
 url="https://wiki.archlinux.org/title/Archboot"
 license=('GPL')
@@ -18,12 +18,16 @@
     echo "grub,1,Free Software Foundation,grub,2.06,https//www.gnu.org/software/grub/" >> ${srcdir}/sbat.csv
     echo "arch,1,Arch Linux,\$pkgname,\$pkgver,https://archlinux.org/packages/core/x86_64/grub/" >> ${srcdir}/sbat.csv
     ### Hint: https://src.fedoraproject.org/rpms/grub2/blob/rawhide/f/grub.macros#_407
-    _GRUB_MODULES="all_video boot btrfs cat configfile cryptodisk echo efi_gop efi_uga efifwsetup efinet ext2 f2fs fat font fshelp gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard"
+    _GRUB_MODULES="all_video boot btrfs cat configfile cryptodisk echo efi_gop efi_uga efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard"
     # add -v for verbose
     _COMMON_GRUB_OPTIONS="--sbat ${srcdir}/sbat.csv --modules="${_GRUB_MODULES}" --fonts="unicode" --locales="en at quot" --themes="""
-    echo 'configfile ${cmdpath}/grubx64.cfg' > ${srcdir}/grubx64.cfg
+    echo 'insmod part_gpt' > ${srcdir}/grubx64.cfg
+    echo 'insmod fat' >> ${srcdir}/grubx64.cfg
+    echo 'configfile ${cmdpath}/grubx64.cfg' >> ${srcdir}/grubx64.cfg
 	grub-mkstandalone -d /usr/lib/grub/x86_64-efi -O x86_64-efi ${_COMMON_GRUB_OPTIONS} -o "${pkgdir}/usr/share/archboot/grub/grubx64.efi" "boot/grub/grub.cfg=${srcdir}/grubx64.cfg"
+    echo 'insmod part_gpt' > ${srcdir}/grubia32.cfg
+    echo 'insmod fat' >> ${srcdir}/grubia32.cfg
     echo 'configfile ${cmdpath}/bootia32.cfg' > ${srcdir}/bootia32.cfg
-	grub-mkstandalone -d /usr/lib/grub/i386-efi -O i386-efi ${_COMMON_GRUB_OPTIONS} -o "${pkgdir}/usr/share/archboot/grub/grubia32.efi" "boot/grub/grub.cfg=${X86_64}/bootia32.cfg"
+	grub-mkstandalone -d /usr/lib/grub/i386-efi -O i386-efi ${_COMMON_GRUB_OPTIONS} -o "${pkgdir}/usr/share/archboot/grub/grubia32.efi" "boot/grub/grub.cfg=${srcdir}/bootia32.cfg"
 }
 # vim:set sw=2 et: