diff options
Diffstat (limited to 'package/grub/Makefile')
| -rw-r--r-- | package/grub/Makefile | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/package/grub/Makefile b/package/grub/Makefile index ab36d217e..3d7f8d868 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -4,14 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= grub -PKG_VERSION:= 07662af7aed55bcec448bc2a6610de1f0cb62100 +PKG_VERSION:= 2.12 PKG_RELEASE:= 1 +PKG_HASH:= f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa PKG_DESCR:= multiboot boot loader PKG_SECTION:= base/boot PKG_BUILDDEP:= bison-host grub-host -HOST_BUILDDEP:= python2-host +HOST_BUILDDEP:= python3-host PKG_URL:= http://www.gnu.org/software/grub -PKG_SITES:= https://git.savannah.gnu.org/git/grub.git +PKG_SITES:= https://ftp.gnu.org/gnu/grub/ PKG_NOPARALLEL:= 1 PKG_ARCH_DEPENDS:= x86 x86_64 mips mips64 ppc ppc64 @@ -36,8 +37,6 @@ $(eval $(call PKG_template,GRUB_TOOLS,grub-tools,$(PKG_VERSION)-${PKG_RELEASE},$ TARGET_CFLAGS:=$(filter-out -fstack-protector-all,$(TARGET_CFLAGS)) TARGET_CFLAGS:=$(filter-out -flto,$(TARGET_CFLAGS)) -AUTOTOOL_STYLE:= autogen - ifeq ($(ADK_PACKAGE_GRUB_ARC),y) GRUB_ARCH= mips-arc GRUB_IMAGE= grub.img @@ -67,6 +66,11 @@ GRUB_PREFIX= (hd0,msdos1)/boot/grub GRUB_TARGET= i386 GRUB_PLATFORM= pc GRUB_MODULES= boot linux ext2 fat part_msdos part_gpt normal biosdisk +ifeq ($(ADK_TARGET_QEMU_WITH_GRAPHIC),y) +GRUB_CFG= grub-pc-vga.cfg +else +GRUB_CFG= grub-pc-serial.cfg +endif endif ifeq ($(ADK_PACKAGE_GRUB_EFI_X86),y) @@ -78,6 +82,11 @@ GRUB_PREFIX= /EFI/BOOT GRUB_TARGET= i386 GRUB_PLATFORM= efi GRUB_MODULES= boot linux ext2 fat part_msdos part_gpt normal efi_gop +ifeq ($(ADK_TARGET_DUAL_BOOT),y) +GRUB_CFG= grub-efi-serial-dual.cfg +else +GRUB_CFG= grub-efi-serial.cfg +endif endif ifeq ($(ADK_PACKAGE_GRUB_EFI_X86_64),y) @@ -89,12 +98,11 @@ GRUB_PREFIX= /EFI/BOOT GRUB_TARGET= x86_64 GRUB_PLATFORM= efi GRUB_MODULES= boot linux ext2 fat part_msdos part_gpt normal efi_gop -endif - ifeq ($(ADK_TARGET_DUAL_BOOT),y) -GRUB_CFG= grub-dual.cfg +GRUB_CFG= grub-efi-dual-serial.cfg else -GRUB_CFG= grub.cfg +GRUB_CFG= grub-efi-serial.cfg +endif endif HOST_CONFIGURE_ARGS+= --enable-efiemu=no \ |