grub: update pkgbuild

1 files changed, 182 insertions, 546 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 08da4925f..44eebbd60 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -4,342 +4,6 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
-
-### ARM_UBOOT - loadaddr ###
-# 0x00007fc0   - versatile[versatile_ab/versatile_pb]
-# 0x00100000   - snowball/u8500_href
-# 0x00800000   - dns325/highbank/wireless_space
-# 0x02000000   - zynq[zynq_microzed/zynq_picozed/zynq_zc702/zynq_zc706/zynq_zc70x/zynq_zc770[zynq_zc770_xm010/zynq_zc770_xm012/zynq_zc770_xm013]/zynq_zed/zynq_zybo]
-# 0x08000000   - grub
-# 0x10800000   - cm_fx6
-# 0x12000000   - aristainetos[aristainetos/aristainetos2]/mx6[mx6slevk/mx6sxsabresd]
-# 0x40007000   - origen
-# 0x43e00000   - origen
-# 0x60008000   - vexpress_ca9x4
-# 0x70800000   - ima3-mx53/mx53evk/mx53smd
-# 0x72000000   - mx53ard/mx53loco
-# 0x80000000   - am335x_bur[kwb/tseries]/am3517[am3517_crane/am3517_evm]/mcx
-# 0x80007fc0   - am335x_ti[pcm051]
-# 0x80008000   - vexpress_ca9x4/vexpress[vexpress_ca15_tc2/vexpress_ca5x2](extended-mem)
-# 0x80100000   - am335x_bur[kwb]/ls2085a[ls2085a_emu/ls2085a_simu/ls2085aqds/ls2085ardb]
-# 0x80200000   - am335x_bur[tseries]/am335x_ti[am335x_evm/omap3_beagle/pengwyn]/ti814x_evm
-# 0x80800000   - * flea3/mx31ads/mx35pdk/qong/woodburn/woodburn_sd
-# 0x81000000   - ti814x_evm * mx25pdk/omap3_logic/ti816x_evm/tx25
-# 0x82000000   - am335x_ti[am335x_evm/omap3_beagle/pcm051/pengwyn]/am3517[am3517_crane/am3517_evm]/mcx
-#               /mx6[gw_ventana[gwventana]/mx6cuboxi/mx6qarm2[mx6dlarm2]/mx6qsabreauto[mx6dlsabreauto]/mx6sabresd[mx6dlsabresd/mx6qsabresd]]
-#               /omap3_ti[devkit8000]
-# *              bav335x/cm_t335/cm_t3517/dig297/omap3_evm/omap3_igep00x0/omap3_mvblx/omap3_sdp3430/omap3_zoom1/tao3530
-# 0x84000000   - am335x_baltos
-# 0x90000000   - vexpress64_base[vexpress_aemv8a_semi]/vexpress64_juno[vexpress_aemv8a_juno]
-# 0x90000000UL - ls2085a[ls2085a_emu/ls2085a_simu/ls2085aqds/ls2085ardb]
-# 0x90800000   - vision2
-# 0x92000000   - mx51evk
-# 0xa0008000   - vexpress[vexpress_ca15_tc2/vexpress_ca5x2](extended-mem)
-# 0xa0800000   - imx27lite
-# 0xc0000014   - davinci[ea20]
-# 0xc0700000   - davinci[ea20]
-# 0x12000000   - udoo_dl udoo_quad
-
-# alt
-# am335x_igep0033
-# am43xx_evm
-# apalis_t30
-# apf27
-# apx4devkit
-# armadillo-800eva
-# arndale
-# aspenite
-# at91rm9200ek
-# at91sam9260ek at91sam9g20ek/at91sam9xeek
-# at91sam9261ek at91sam9g10ek
-# at91sam9263ek
-# at91sam9m10g45ek
-# at91sam9n12ek
-# at91sam9rlek
-# at91sam9x5ek
-# balloon3
-# bav335x birdland_bav335a/birdland_bav335b
-# bcm28155_ap bcm11130/bcm28155_w1d
-# bcmcygnus bcm911360/bcm911360k/bcm958300k/bcm958305k
-# bcmnsp bcm958622hr
-# beagle_x15
-# beaver
-# bg0900
-# calimain
-# cam_enc_4xx
-# cardhu
-# cgtqmx6eval cgtqmx6qeval
-# cm_t335
-# cm_t3517
-# cm_t35
-# cm_t54
-# colibri_pxa270
-# colibri_t20
-# colibri_t30
-# colibri_vf
-# corvus
-# cpu9260 cpu9G20
-# cpuat91
-# da830evm
-# da850evm da850_am18xxevm
-# dalmore
-# davinci_dm355evm
-# davinci_dm355leopard
-# davinci_dm365evm
-# davinci_dm6467evm davinci_dm6467Tevm
-# davinci_dvevm
-# davinci_schmoogie
-# davinci_sffsdr
-# davinci_sonata
-# db-88f6820-gp
-# db-mv784mp-gp
-# devkit3250
-# devkit8000
-# dig297
-# dockstar
-# dra7xx_evm
-# draco
-# dreamplug
-# duovero
-# eb_cpux9k2
-# eco5pk
-# edb93xx edb9315a
-# edminiv2
-# embestmx6boards marsboard/riotboard
-# enbw_cmc
-# ethernut5
-# flea3
-# goflexhome
-# gose
-# gplugd
-# guruplug
-# h2200
-# harmony
-# ib62x0
-# iconnect
-# imx27lite
-# imx31_litekit
-# imx31_phycore
-# integrator_ap integratorap_cm720t/integratorap_cm920t/integratorap_cm926ej_s/integratorap_cm946es
-# integrator_cp integratorcp_cm1136/integratorcp_cm920t/integratorcp_cm926ej_s/integratorcp_cm946es
-# ipam390
-# jetson-tk1
-# jornada
-# k2e_evm
-# k2hk_evm
-# k2l_evm
-# km_kirkwood kmcoge5un/kmnusa/kmsugp1/kmsuv31/mgcoge3un/portl2
-# koelsch
-# kosagi_novena novena
-# kzm9g
-# lager
-# lp8x4x
-# ls1021aqds
-# ls1021atwr
-# lsxl lschlv2/lsxhl
-# magnesium
-# maxbcm
-# mcx
-# medcom-wide
-# meesc
-# m28evk
-# m53evk
-# mt_ventoux
-# mv88f6281gtw_ge
-# mx23_olinuxino
-# mx23evk
-# mx25pdk
-# mx28evk
-# mx31ads
-# mx31pdk
-# mx35pdk
-# mx51_efikamx mx51_efikasb
-# mx51evk
-# nas220
-# net2big_v2 d2net_v2
-# netspace_v2 inetspace_v2/netspace_lite_v2/netspace_max_v2/netspace_mini_v2
-# nitrogen6x mx6qsabrelite/nitrogen6dl2g/nitrogen6dl/nitrogen6q2g/nitrogen6q/nitrogen6s1g/nitrogen6s
-# nokia_rx51
-# nomadik_nhk8815
-# nyan-big
-# odroid
-# odroid-xu3
-# omap3_cairo cairo
-# omap3_evm
-# omap3_evm_quick
-# omap3_igep00x0 igep0020/igep0030/igep0032
-# omap3_logic
-# omap3_mvblx
-# omap3_overo
-# omap3_pandora
-# omap3_sdp3430
-# omap3_zoom1
-# omap4_panda
-# omap4_sdp4430
-# omap5_uevm
-# omapl138_lcdk
-# openrd
-# origen
-# ot1200
-# otc570
-# palmld
-# palmtreo680
-# paz00
-# peach-pi
-# peach-pit
-# pengwyn
-# pepper
-# platinum_picon
-# platinum_titanium
-# plutux
-# pm9261
-# pm9263
-# pm9g45
-# pogo_e02
-# porter
-# pxa255_idp
-# pxm2
-# qong
-# rastaban
-# rd6281a
-# rpi_2
-# rpi
-# rut
-# s5p_goni
-# s5pc210_universal
-# sama5d3_xplained
-# sama5d3xek
-# sama5d4_xplained
-# sama5d4ek
-# sansa_fuze_plus
-# sc_sps_1
-# scb9328
-# seaboard
-# secomx6 secomx6quq7
-# sheevaplug
-# silk
-# smdk2410
-# smdk5250
-# smdk5420
-# smdkc100
-# smdkv310
-# snapper9260 snapper9g20
-# snow
-# socfpga_arria5
-# socfpga_cyclone5 socfpga_socrates
-# spear300
-# spear310
-# spear320
-# spear600
-# stamp9g20 portuxg20
-# stm32f429-discovery
-# stv0991
-# sun4i-a10-a1000(mele)
-# sun4i-a10-ba10-tvbox
-# sun4i-a10-chuwi-v7-cw0825
-# sun4i-a10-cubieboard
-# sun4i-a10-gemei-g9
-# sun4i-a10-hyundai-a7hd
-# sun4i-a10-inet-3f
-# sun4i-a10-inet-3w
-# sun4i-a10-jesurun-q5
-# sun4i-a10-marsboard
-# sun4i-a10-mini-xplus
-# sun4i-a10-mk802
-# sun4i-a10-mk802ii
-# sun4i-a10-olinuxino-lime
-# sun4i-a10-pcduino
-# sun5i-a10s-auxtek-t004
-# sun5i-a10s-mk802
-# sun5i-a10s-olinuxino-micro
-# sun5i-a10s-r7-tv-dongle
-# sun5i-a13-ampe-a76
-# sun5i-a13-forfun-q88db
-# sun5i-a13-inet-86vs
-# sun5i-a13-olinuxino
-# sun5i-a13-olinuxino-micro
-# sun5i-a13-tzx-q8-713b7
-# sun5i-a13-utoo-p66
-# sun6i-a31-colombus
-# sun6i-a31-hummingbird
-# sun6i-a31-i7(mele)
-# sun6i-a31-m9(mele)
-# sun6i-a31-mele-a1000g-quad
-# sun6i-a31-mixtile-loftq
-# sun6i-a31s-cs908
-# sun6i-a31s-primo81(msi)
-# sun7i-a20-ainol-aw1
-# sun7i-a20-bananapi
-# sun7i-a20-bananapro
-# sun7i-a20-cubieboard2
-# sun7i-a20-cubietruck
-# sun7i-a20-i12-tvbox
-# sun7i-a20-m3(mele)
-# sun7i-a20-m5(mele)
-# sun7i-a20-mk808c
-# sun7i-a20-olinuxino-lime
-# sun7i-a20-olinuxino-lime2
-# sun7i-a20-olinuxino-micro
-# sun7i-a20-orangepi
-# sun7i-a20-orangepi-mini
-# sun7i-a20-pcduino3
-# sun7i-a20-pcduino3-nano
-# sun7i-a20-primo73(msi)
-# sun7i-a20-wexler-tab7200
-# sun7i-a20-wits-pro-a20-dkt
-# sun7i-a20-yones-toptech-bd1078
-# sun8i-a23-ippo-q8h-v1.2
-# sun8i-a23-ippo-q8h-v5
-# sun8i-a33-et-q8-v1.6
-# sun8i-a33-ga10h-v1.1
-# sun8i-a33-ippo-q8h-v1.2
-# sun8i-a33-sinlinx-sina33
-# sun9i-a80-optimus(merri)
-# tao3530 omap3_ha
-# taurus axm
-# tbs2910
-# tec
-# tec-ng
-# thuban
-# ti814x_evm
-# ti816x_evm
-# titanium
-# tk71
-# tqma6 tqma6q_mba6/tqma6s_mba6
-# trats
-# trats2
-# tricorder
-# trimslice
-# trizepsiv polaris
-# tseries
-# tt01
-# twister
-# tx25
-# uniphier-ph1-ld4-ref
-# uniphier-ph1-pro4-ref
-# uniphier-ph1-sld8-ref
-# usb_a9263
-# usbarmory
-# VCMA9
-# venice2
-# ventana
-# vf610twr
-# vl_ma2sc
-# vpac270
-# wandboard
-# warp
-# whistler
-# woodburn
-# woodburn_sd
-# work_92105
-# x600
-# xaeniax
-# xfi3
-# xilinx_zynqmp
-# zipitz2
-# zmx25
-
-
 ## '1' to enable IA32-EFI build in Arch x86_64, '0' to disable
 _IA32_EFI_IN_ARCH_X64='1'
 
@@ -350,10 +14,10 @@ _IA32_XEN_IN_ARCH_X64='1'
 _GRUB_EMU_BUILD='0'
 
 _pkgver='2.02'
-_GRUB_GIT_TAG='grub-2.02-beta2'
-_GRUB_EXTRAS_COMMIT=4a56e2c2cc3d78f12f1788c27669a651071dee49
+_GRUB_GIT_TAG='grub-2.02-beta3'
+_GRUB_EXTRAS_COMMIT=f2a079441939eee7251bf141986cdd78946e1d20
 
-_UNIFONT_VER='6.3.20131217'
+_UNIFONT_VER='8.0.01'
 
 [[ "${CARCH}" = 'armv7h' ]] && _EFI_ARCH='arm'
 [[ "${CARCH}" = 'x86_64' ]] && _EFI_ARCH='x86_64'
@@ -372,7 +36,7 @@ pkgname=('grub')
                                    'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab')
 pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)'
 pkgver='2.02.beta2'
-pkgrel='6.parabola1'
+pkgrel='1.parabola1'
 epoch='1'
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64' 'i686' 'armv7h')
@@ -393,12 +57,7 @@ if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
 fi
 
 optdepends=('freetype2: For grub-mkfont usage'
-            'fuse: For grub-mount usage'
-            'dosfstools: For grub-mkrescue FAT FS and EFI support' 
-            'efibootmgr: For grub-install EFI support'
-            'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
-            'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
-            'mtools: For grub-mkrescue FAT FS support')
+            'fuse: For grub-mount usage')
 
 if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
 	provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
@@ -484,10 +143,10 @@ prepare() {
 	cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf"
 
 	# DISABLED TEMPORARY, due fail to build.
-	# msg "Add the grub-extra sources for BIOS build"
-	# install -d "${srcdir}/grub-${_pkgver}/grub-extras"
-	# cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}/grub-extras/915resolution" # failed in compilation
-	# export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}/grub-extras/"
+	 msg "Add the grub-extra sources for BIOS build"
+	 install -d "${srcdir}/grub-${_pkgver}/grub-extras"
+	 cp -r "${srcdir}/grub-extras/915resolution" "${srcdir}/grub-${_pkgver}/grub-extras/915resolution" # failed in compilation
+	 export GRUB_CONTRIB="${srcdir}/grub-${_pkgver}/grub-extras/"
 }
 
 _build_grub-efi() {
@@ -873,17 +532,8 @@ _build_grub-uboot_am335x-bone() {
 	msg 'Patch to detect am335x-bone device tree blob file (dtb)'
 	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
 
-        msg 'change memory adapted for am335x-bone support'
-        sed -i '\|arm_uboot_ldflags| s|0x08000000|0x82000000|
-                \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x82000000|
-               ' grub-core/Makefile.core.def \
-                 include/grub/offsets.h
-        #sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x82000000|
-        #        \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x88080000|
-        #        \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x88000000|
-        #       ' include/grub/arm/linux.h
-        sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-               ' grub-core/loader/arm/linux.c
+	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
+	#       ' grub-core/loader/arm/linux.c
 
 	msg 'Unset all compiler FLAGS for U-Boot (am335x-bone) build'
 	unset CFLAGS
@@ -927,186 +577,159 @@ _build_grub-uboot_am335x-bone() {
 }
 
 _build_grub-uboot_omap3_beagle() {
-        msg "Copy the source for building the U-Boot (omap3_beagle) part"
-        cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle"
-        cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle/"
-
-        msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
-        patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
-
-        msg 'change memory adapted for omap3_beagle support'
-        sed -i '\|arm_uboot_ldflags| s|0x08000000|0x82000000|
-                \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x82000000|
-               ' grub-core/Makefile.core.def \
-                 include/grub/offsets.h
-        #sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x82000000|
-        #        \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x88080000|
-        #        \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x88000000|
-        #       ' include/grub/arm/linux.h
-        sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-               ' grub-core/loader/arm/linux.c
-
-        msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle) build'
-        unset CFLAGS
-        unset CPPFLAGS
-        unset CXXFLAGS
-        unset LDFLAGS
-        unset MAKEFLAGS
-
-        cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle/"
-
-        msg 'Run autogen.sh for U-Boot (omap3_beagle) build'
-        ./autogen.sh
-
-        msg 'Run ./configure for U-Boot (omap3_beagle) build'
-        ./configure \
-                --with-platform='uboot' \
-                --target='arm' \
-                --disable-efiemu \
-                --enable-mm-debug \
-                --enable-nls \
-                --enable-device-mapper \
-                --enable-cache-stats \
-                --enable-boot-time \
-                --enable-grub-mkfont \
-                --enable-grub-mount \
-                --prefix='/usr' \
-                --bindir='/usr/bin' \
-                --sbindir='/usr/bin' \
-                --mandir='/usr/share/man' \
-                --infodir='/usr/share/info' \
-                --datarootdir='/usr/share' \
-                --sysconfdir='/etc' \
-                --program-prefix='' \
-                --with-bootdir='/boot' \
-                --with-grubdir='grub' \
-                --disable-silent-rules \
-                --disable-werror
-
-        msg 'Run make for U-Boot (omap3_beagle) build'
-        make
+	msg "Copy the source for building the U-Boot (omap3_beagle) part"
+	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle"
+	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle/"
+
+	msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
+
+	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
+	#       ' grub-core/loader/arm/linux.c
+
+	msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle) build'
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+
+	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle/"
+
+	msg 'Run autogen.sh for U-Boot (omap3_beagle) build'
+	./autogen.sh
+
+	msg 'Run ./configure for U-Boot (omap3_beagle) build'
+	./configure \
+		--with-platform='uboot' \
+		--target='arm' \
+		--disable-efiemu \
+		--enable-mm-debug \
+		--enable-nls \
+		--enable-device-mapper \
+		--enable-cache-stats \
+		--enable-boot-time \
+		--enable-grub-mkfont \
+		--enable-grub-mount \
+		--prefix='/usr' \
+		--bindir='/usr/bin' \
+		--sbindir='/usr/bin' \
+		--mandir='/usr/share/man' \
+		--infodir='/usr/share/info' \
+		--datarootdir='/usr/share' \
+		--sysconfdir='/etc' \
+		--program-prefix='' \
+		--with-bootdir='/boot' \
+		--with-grubdir='grub' \
+		--disable-silent-rules \
+		--disable-werror
+
+	msg 'Run make for U-Boot (omap3_beagle) build'
+	make
 }
 
 _build_grub-uboot_omap3_beagle_xm() {
-        msg "Copy the source for building the U-Boot (omap3_beagle_xm) part"
-        cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm"
-        cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm/"
-
-        msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
-        patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
-
-        msg 'change memory adapted for omap3_beagle_xm support'
-        sed -i '\|arm_uboot_ldflags| s|0x08000000|0x82000000|
-                \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x82000000|
-               ' grub-core/Makefile.core.def \
-                 include/grub/offsets.h
-        #sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x82000000|
-        #        \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x88080000|
-        #        \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x88000000|
-        #       ' include/grub/arm/linux.h
-        sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-               ' grub-core/loader/arm/linux.c
-
-        msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle_xm) build'
-        unset CFLAGS
-        unset CPPFLAGS
-        unset CXXFLAGS
-        unset LDFLAGS
-        unset MAKEFLAGS
-
-        cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm/"
-
-        msg 'Run autogen.sh for U-Boot (omap3_beagle_xm) build'
-        ./autogen.sh
-
-        msg 'Run ./configure for U-Boot (omap3_beagle_xm) build'
-        ./configure \
-                --with-platform='uboot' \
-                --target='arm' \
-                --disable-efiemu \
-                --enable-mm-debug \
-                --enable-nls \
-                --enable-device-mapper \
-                --enable-cache-stats \
-                --enable-boot-time \
-                --enable-grub-mkfont \
-                --enable-grub-mount \
-                --prefix='/usr' \
-                --bindir='/usr/bin' \
-                --sbindir='/usr/bin' \
-                --mandir='/usr/share/man' \
-                --infodir='/usr/share/info' \
-                --datarootdir='/usr/share' \
-                --sysconfdir='/etc' \
-                --program-prefix='' \
-                --with-bootdir='/boot' \
-                --with-grubdir='grub' \
-                --disable-silent-rules \
-                --disable-werror
-
-        msg 'Run make for U-Boot (omap3_beagle_xm) build'
-        make
+	msg "Copy the source for building the U-Boot (omap3_beagle_xm) part"
+	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm"
+	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm/"
+
+	msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
+
+	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
+	#       ' grub-core/loader/arm/linux.c
+
+	msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle_xm) build'
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+
+	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm/"
+
+	msg 'Run autogen.sh for U-Boot (omap3_beagle_xm) build'
+	./autogen.sh
+
+	msg 'Run ./configure for U-Boot (omap3_beagle_xm) build'
+	./configure \
+		--with-platform='uboot' \
+		--target='arm' \
+		--disable-efiemu \
+		--enable-mm-debug \
+		--enable-nls \
+		--enable-device-mapper \
+		--enable-cache-stats \
+		--enable-boot-time \
+		--enable-grub-mkfont \
+		--enable-grub-mount \
+		--prefix='/usr' \
+		--bindir='/usr/bin' \
+		--sbindir='/usr/bin' \
+		--mandir='/usr/share/man' \
+		--infodir='/usr/share/info' \
+		--datarootdir='/usr/share' \
+		--sysconfdir='/etc' \
+		--program-prefix='' \
+		--with-bootdir='/boot' \
+		--with-grubdir='grub' \
+		--disable-silent-rules \
+		--disable-werror
+
+	msg 'Run make for U-Boot (omap3_beagle_xm) build'
+	make
 }
 
 _build_grub-uboot_omap3_beagle_xm_ab() {
-        msg "Copy the source for building the U-Boot (omap3_beagle_xm_ab) part"
-        cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab"
-        cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab/"
-
-        msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
-        patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
-
-        msg 'change memory adapted for omap3_beagle_xm_ab support'
-        sed -i '\|arm_uboot_ldflags| s|0x08000000|0x82000000|
-                \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x82000000|
-               ' grub-core/Makefile.core.def \
-                 include/grub/offsets.h
-        #sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x82000000|
-        #        \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x88080000|
-        #        \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x88000000|
-        #       ' include/grub/arm/linux.h
-        sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-               ' grub-core/loader/arm/linux.c
-
-        msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle_xm_ab) build'
-        unset CFLAGS
-        unset CPPFLAGS
-        unset CXXFLAGS
-        unset LDFLAGS
-        unset MAKEFLAGS
-
-        cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab/"
-
-        msg 'Run autogen.sh for U-Boot (omap3_beagle_xm_ab) build'
-        ./autogen.sh
-
-        msg 'Run ./configure for U-Boot (omap3_beagle_xm_ab) build'
-        ./configure \
-                --with-platform='uboot' \
-                --target='arm' \
-                --disable-efiemu \
-                --enable-mm-debug \
-                --enable-nls \
-                --enable-device-mapper \
-                --enable-cache-stats \
-                --enable-boot-time \
-                --enable-grub-mkfont \
-                --enable-grub-mount \
-                --prefix='/usr' \
-                --bindir='/usr/bin' \
-                --sbindir='/usr/bin' \
-                --mandir='/usr/share/man' \
-                --infodir='/usr/share/info' \
-                --datarootdir='/usr/share' \
-                --sysconfdir='/etc' \
-                --program-prefix='' \
-                --with-bootdir='/boot' \
-                --with-grubdir='grub' \
-                --disable-silent-rules \
-                --disable-werror
-
-        msg 'Run make for U-Boot (omap3_beagle_xm_ab) build'
-        make
+	msg "Copy the source for building the U-Boot (omap3_beagle_xm_ab) part"
+	cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab"
+	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab/"
+
+	msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
+
+	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
+	#       ' grub-core/loader/arm/linux.c
+
+	msg 'Unset all compiler FLAGS for U-Boot (omap3_beagle_xm_ab) build'
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+
+	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab/"
+
+	msg 'Run autogen.sh for U-Boot (omap3_beagle_xm_ab) build'
+	./autogen.sh
+
+	msg 'Run ./configure for U-Boot (omap3_beagle_xm_ab) build'
+	./configure \
+		--with-platform='uboot' \
+		--target='arm' \
+		--disable-efiemu \
+		--enable-mm-debug \
+		--enable-nls \
+		--enable-device-mapper \
+		--enable-cache-stats \
+		--enable-boot-time \
+		--enable-grub-mkfont \
+		--enable-grub-mount \
+		--prefix='/usr' \
+		--bindir='/usr/bin' \
+		--sbindir='/usr/bin' \
+		--mandir='/usr/share/man' \
+		--infodir='/usr/share/info' \
+		--datarootdir='/usr/share' \
+		--sysconfdir='/etc' \
+		--program-prefix='' \
+		--with-bootdir='/boot' \
+		--with-grubdir='grub' \
+		--disable-silent-rules \
+		--disable-werror
+
+	msg 'Run make for U-Boot (omap3_beagle_xm_ab) build'
+	make
 }
 
 _build_grub-uboot_udoo() {
@@ -1117,17 +740,8 @@ _build_grub-uboot_udoo() {
 	msg 'Patch to detect udoo device tree blob file (dtb)'
 	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
 
-	msg 'change memory adapted for udoo support'
-	sed -i '\|arm_uboot_ldflags| s|0x08000000|0x12000000|
-                \|GRUB_KERNEL_ARM_UBOOT_LINK_ADDR| s|0x08000000|0x12000000|
-	       ' grub-core/Makefile.core.def \
-	         include/grub/offsets.h
-        #sed -i '\|LINUX_ADDRESS| s|start_of_ram [+] 0x8000|0x12000000|
-        #        \|LINUX_INITRD_ADDRESS| s|start_of_ram [+] 0x02000000|0x12A00000|
-        #        \|LINUX_FDT_ADDRESS| s|LINUX_INITRD_ADDRESS [-] 0x10000|0x18000000|
-        #       ' include/grub/arm/linux.h
-        sed -i '\|grub_arm_disable_caches_mmu|,+4 d
-               ' grub-core/loader/arm/linux.c
+	#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
+	#       ' grub-core/loader/arm/linux.c
 
 	msg 'Unset all compiler FLAGS for U-Boot (udoo) build'
 	unset CFLAGS
@@ -1329,6 +943,13 @@ _package_grub-emu() {
 }
 
 package_grub() {
+	optdepends+=('dosfstools: For grub-mkrescue FAT FS and EFI support'
+	             'efibootmgr: For grub-install EFI support'
+	             'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
+	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+	             'mtools: For grub-mkrescue FAT FS support')
+
+
 	if [[ "${CARCH}" = 'i686' ]]; then
 		optdepends+=('linux-libre-xen: For boot support into XEN server')
 	fi
@@ -1389,6 +1010,9 @@ package_grub() {
 
 package_grub-am335x_bone() {
 	pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBone and BeagleBone Black (am335x-bone), (Parabola rebranded)'
+	optdepends+=('dosfstools: For grub-mkrescue FAT FS'
+	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+	             'mtools: For grub-mkrescue FAT FS support')
 
 	cd "${srcdir}/grub-${_pkgver}-uboot_am335x-bone/"
 
@@ -1409,6 +1033,9 @@ package_grub-am335x_bone() {
 package_grub-omap3_beagle() {
 	pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard (omap3_beagle), (Parabola rebranded)'
 	provides+=('grub-beagleboard')
+	optdepends+=('dosfstools: For grub-mkrescue FAT FS'
+	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+	             'mtools: For grub-mkrescue FAT FS support')
 
 	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle/"
 
@@ -1429,6 +1056,9 @@ package_grub-omap3_beagle() {
 package_grub-omap3_beagle_xm() {
 	pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM (omap3_beagle_xm), (Parabola rebranded)'
 	provides+=('grub-beagleboard')
+	optdepends+=('dosfstools: For grub-mkrescue FAT FS'
+	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+	             'mtools: For grub-mkrescue FAT FS support')
 
 	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm/"
 
@@ -1449,6 +1079,9 @@ package_grub-omap3_beagle_xm() {
 package_grub-omap3_beagle_xm_ab() {
 	pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM rev A/B (omap3_beagle_xm_ab), (Parabola rebranded)'
 	provides+=('grub-beagleboard')
+	optdepends+=('dosfstools: For grub-mkrescue FAT FS'
+	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+	             'mtools: For grub-mkrescue FAT FS support')
 
 	cd "${srcdir}/grub-${_pkgver}-uboot_omap3_beagle_xm_ab/"
 
@@ -1468,6 +1101,9 @@ package_grub-omap3_beagle_xm_ab() {
 
 package_grub-udoo() {
 	pkgdesc='GNU GRand Unified Bootloader (2) for UDOO (udoo), (Parabola rebranded)'
+	optdepends+=('dosfstools: For grub-mkrescue FAT FS'
+	             'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+	             'mtools: For grub-mkrescue FAT FS support')
 
 	cd "${srcdir}/grub-${_pkgver}-uboot_udoo/"