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 <[email protected]>
---
 libre/grub/PKGBUILD | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index cf02013331..b06fdf5256 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -33,6 +33,8 @@
 #
 #      * --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"
@@ -63,7 +65,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'
@@ -95,7 +97,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')
@@ -134,9 +136,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 <[email protected]>
@@ -499,8 +500,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/"
-- 
2.41.0

_______________________________________________
Dev mailing list
[email protected]
https://lists.parabola.nu/mailman/listinfo/dev

Reply via email to