summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2024-03-22 00:29:46 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2024-04-14 18:45:00 +0200
commit5097b4b587eb1c23763621677cd1b85b8cffac5e (patch)
tree6facd85b93765ba50f4baf95c2b18f59871ea1c9
parent894069a298e0f17269a6d32dbf9a3ee2603f1b22 (diff)
libre/grub: enable grub-emu.
Since grub-emu now supports kexec (with 'grub-emu --kexec') it can now be used to boot. As for the dependencies, libusbx was removed because not only this library is not maintained nor packaged anymore, but after moving to libusb, GRUB also removed support for it as the code was not maintained anymore. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--libre/grub/PKGBUILD13
1 files changed, 6 insertions, 7 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 74aabd67f..39a19341f 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -22,6 +22,7 @@
# "grub: add armv7h support (U-Boot and UEFI)"
# (2015-09-26, Márcio Alexandre Silva Delgado <coadde@parabola.nu>)
# * --with-platform=uboot (ARM)
+# * --with-platform=emu (enabled _GRUB_EMU_BUILD=1, fixed dependencies)
# + Parabola additions, since
# "grub: rm unused grub-extras in U-Boot, fix msg on U-Boot build; add IEEE1275 (OpenFirmware) and Libreboot support"
# (2015-09-26, Márcio Alexandre Silva Delgado <coadde@parabola.nu>)
@@ -48,7 +49,7 @@ _IA32_EFI_IN_ARCH_X64="1"
_IA32_XEN_IN_ARCH_X64="1"
## "1" to enable EMU build, "0" to disable
-_GRUB_EMU_BUILD="0"
+_GRUB_EMU_BUILD="1"
[[ "${CARCH}" == 'armv7h' ]] && _EFI_ARCH='arm'
[[ "${CARCH}" == 'x86_64' ]] && _EFI_ARCH='x86_64'
@@ -80,7 +81,7 @@ _pkgver=2.12
_unifont_ver='15.1.04'
pkgver=${_pkgver/-/}
pkgrel=1
-pkgrel+=.parabola2
+pkgrel+=.parabola3
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
arch+=('i686')
@@ -119,9 +120,8 @@ if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_XEN}" = '1' ]]; then
fi
if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
- makedepends+=('libusbx' 'sdl')
- #optdepends+=('libusbx: For grub-emu USB support' # drop from the device-specific arm-uboot packages
- # 'sdl: For grub-emu SDL support') # drop from the device-specific arm-uboot packages
+ makedepends+=('sdl')
+ #optdepends+=('sdl: For grub-emu SDL support') # drop from the device-specific arm-uboot packages
fi
validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
@@ -484,8 +484,7 @@ package_grub() {
'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue')
if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
- optdepends+=('libusbx: For grub-emu USB support'
- 'sdl: For grub-emu SDL support')
+ optdepends+=('sdl: For grub-emu SDL support')
fi
cd "${srcdir}/grub/"