diff options
| author | Luke T. Shumaker <lukeshu@parabola.nu> | 2024-01-07 15:22:55 -0700 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@parabola.nu> | 2024-01-07 20:18:29 -0700 |
| commit | 95b197eb948f67a88a0a3bd6d91037d56aa39eec (patch) | |
| tree | 364849c14b7c18a47fc861c0f21c5cf8083c1a77 /libre/grub | |
| parent | 65aece7497603eee1a7ea43b5ee8524ce8e95406 (diff) | |
libre/grub: move the _{build,package}_grub-{bios,efi,emu} functions up/down
To match the order in the Arch PKGBUILD
Diffstat (limited to 'libre/grub')
| -rw-r--r-- | libre/grub/PKGBUILD | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index e8ac2a298..dbbf00f06 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -248,22 +248,6 @@ _build_grub() { make } -_build_grub-efi() { - _build_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ - "${_EFI_ARCH}-efi" \ - --disable-efiemu \ - --enable-boot-time \ - "${_configure_options[@]}" -} - -_build_grub-xen() { - _build_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ - "${_XEN_ARCH}-xen" \ - --disable-efiemu \ - --enable-boot-time \ - "${_configure_options[@]}" -} - _build_grub-bios() { echo 'Set ARCH dependent variables for BIOS build...' local _EFIEMU @@ -280,6 +264,31 @@ _build_grub-bios() { "${_configure_options[@]}" } +_build_grub-efi() { + _build_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ + "${_EFI_ARCH}-efi" \ + --disable-efiemu \ + --enable-boot-time \ + "${_configure_options[@]}" +} + +_build_grub-emu() { + _build_grub 'emu' 'emu' \ + "${_EMU_ARCH}-emu" \ + --enable-grub-emu-usb=no \ + --enable-grub-emu-sdl=no \ + --disable-grub-emu-pci \ + "${_configure_options[@]}" +} + +_build_grub-xen() { + _build_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ + "${_XEN_ARCH}-xen" \ + --disable-efiemu \ + --enable-boot-time \ + "${_configure_options[@]}" +} + _build_grub-qemu() { _build_grub 'qemu' 'QEMU' \ 'i386-qemu' \ @@ -314,15 +323,6 @@ _build_grub-multiboot() { "${_configure_options[@]}" } -_build_grub-emu() { - _build_grub 'emu' 'emu' \ - "${_EMU_ARCH}-emu" \ - --enable-grub-emu-usb=no \ - --enable-grub-emu-sdl=no \ - --disable-grub-emu-pci \ - "${_configure_options[@]}" -} - _build_grub-uboot() { _build_grub 'uboot' 'U-Boot' \ 'arm-uboot' \ @@ -386,21 +386,26 @@ _package_grub() { rm -f "${pkgdir}/usr/lib/grub/${bld_cpuplat}"/{kernel.exec,gdb_grub,gmodule.pl} || true } +_package_grub-bios() { + _package_grub 'bios' 'BIOS' \ + 'i386-pc' +} + _package_grub-efi() { _package_grub "efi-${_EFI_ARCH}" "${_EFI_ARCH} EFI" \ "${_EFI_ARCH}-efi" } +_package_grub-emu() { + _package_grub 'emu' 'emu' \ + "${_EMU_ARCH}-emu" +} + _package_grub-xen() { _package_grub "xen-${_XEN_ARCH}" "${_XEN_ARCH} XEN" \ "${_XEN_ARCH}-xen" } -_package_grub-bios() { - _package_grub 'bios' 'BIOS' \ - 'i386-pc' -} - _package_grub-qemu() { _package_grub 'qemu' 'QEMU' \ 'i386-qemu' @@ -421,11 +426,6 @@ _package_grub-multiboot() { 'i386-multiboot' } -_package_grub-emu() { - _package_grub 'emu' 'emu' \ - "${_EMU_ARCH}-emu" -} - _package_grub-uboot() { _package_grub 'uboot' 'U-Boot' \ 'arm-uboot' |