From fcb8e56cdc4864aa55ae3f377f94f9be3a9fe7c9 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 6 Apr 2014 20:52:19 +0200
Subject: update to 2.00

---
 package/grub/Makefile | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'package/grub/Makefile')

diff --git a/package/grub/Makefile b/package/grub/Makefile
index cfe17a227..eeab31dab 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -4,37 +4,50 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		grub
-PKG_VERSION:=		1.98
+PKG_VERSION:=		2.00
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c0bcf60e524739bb64e3a2d4e3732a59
+PKG_MD5SUM:=		e927540b6eda8b024fb0391eeaa4091c
 PKG_DESCR:=		GRUB2 bootloader (source package)
 PKG_SECTION:=		boot
+PKG_BUILDDEP:=		bison-host
 PKG_URL:=		http://www.gnu.org/software/grub
-PKG_SITES:=		ftp://alpha.gnu.org/gnu/grub/
+PKG_SITES:=		ftp://ftp.gnu.org/gnu/grub/
 
 PKG_HOST_DEPENDS:=	linux
-PKG_ARCH_DEPENDS:=	x86 x86_64
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips
 PKG_NOPARALLEL:=	1
 
+PKG_CHOICES_GRUB:=	PC EFI
+PKGCD_PC:=		build for PC BIOS
+PKGCD_EFI:=		build for EFI
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GRUB,grub,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_PACKAGE_GRUB_PC),y)
+GRUB_ARCH:=		i386-pc
+CONFIGURE_ARGS+=	--with-platform=pc
+endif
+ifeq ($(ADK_PACKAGE_GRUB_EFI),y)
+GRUB_ARCH:=		x86_64-efi
+CONFIGURE_ARGS+=	--with-platform=efi
+endif
+
 ifeq ($(ADK_STATIC),y)
 TARGET_CFLAGS+=         -static
 TARGET_LDFLAGS+=        -static
 endif
 
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s  CPPFLAGS_FOR_BUILD="-I./include"
-CONFIGURE_ARGS+=	--disable-efiemu \
-			--disable-grub-mkfont \
-			--disable-grub-fstest
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 grub-install:
-	${INSTALL_DIR} $(IDIR_GRUB)/usr/{sbin,lib,bin}
+	${INSTALL_DIR} $(IDIR_GRUB)/usr/{sbin,bin}
+	${INSTALL_DIR} $(IDIR_GRUB)/usr/lib/grub/${GRUB_ARCH}/
 	${INSTALL_DIR} $(IDIR_GRUB)/etc
 	${CP} ${WRKINST}/etc/grub.d $(IDIR_GRUB)/etc
-	${CP} ${WRKINST}/usr/lib/* $(IDIR_GRUB)/usr/lib
+	${CP} ${WRKINST}/usr/lib/grub/${GRUB_ARCH}/*{mod,lst,img} \
+		$(IDIR_GRUB)/usr/lib/grub/${GRUB_ARCH}/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/* $(IDIR_GRUB)/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/* $(IDIR_GRUB)/usr/sbin
 
-- 
cgit v1.2.3