From 649b5b92509dba021ed47ef4c04f358de83ba36f Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Mar 2010 18:20:45 +0100
Subject: bootloaders: move bootloader build code to boot/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub2/Config.in                            |  13 +++
 boot/grub2/grub-1.95-001-fix-grub-install.patch |  23 ++++
 boot/grub2/grub2.mk                             | 134 ++++++++++++++++++++++++
 3 files changed, 170 insertions(+)
 create mode 100644 boot/grub2/Config.in
 create mode 100644 boot/grub2/grub-1.95-001-fix-grub-install.patch
 create mode 100644 boot/grub2/grub2.mk

(limited to 'boot/grub2')

diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
new file mode 100644
index 000000000..752639993
--- /dev/null
+++ b/boot/grub2/Config.in
@@ -0,0 +1,13 @@
+config BR2_TARGET_GRUB2
+	bool "grub2"
+	help
+	  The GRand Unified Bootloader for x86 systems, take #2.
+
+config BR2_TARGET_GRUB2_SPLASH
+	bool "Splashimage support"
+	depends on BR2_TARGET_GRUB2
+	help
+	  Add support for splashimage.
+	
+	  A splashimage is a 14-color indexed .xpm picture which
+	  is displayed as background for the grub menu.
diff --git a/boot/grub2/grub-1.95-001-fix-grub-install.patch b/boot/grub2/grub-1.95-001-fix-grub-install.patch
new file mode 100644
index 000000000..3287b61c8
--- /dev/null
+++ b/boot/grub2/grub-1.95-001-fix-grub-install.patch
@@ -0,0 +1,23 @@
+? config.status.lineno
+? fix-grub-install.diff
+? genkernsyms.sh
+? gensymlist.sh
+? grub-mkimage.d
+? grub_script.tab.c
+? grub_script.tab.h
+? kernel_elf_symlist.c
+Index: util/powerpc/ieee1275/grub-install.in
+===================================================================
+RCS file: /cvsroot/grub/grub2/util/powerpc/ieee1275/grub-install.in,v
+retrieving revision 1.5
+diff -u -r1.5 grub-install.in
+--- grub-1.95/util/powerpc/ieee1275/grub-install.in	28 May 2006 23:01:43 -0000	1.5
++++ grub-1.95/util/powerpc/ieee1275/grub-install.in	4 Mar 2007 19:05:47 -0000
+@@ -23,6 +23,7 @@
+ # Initialize some variables.
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
++bindir=@bindir@
+ sbindir=@sbindir@
+ libdir=@libdir@
+ PACKAGE_NAME=@PACKAGE_NAME@
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
new file mode 100644
index 000000000..119397bb4
--- /dev/null
+++ b/boot/grub2/grub2.mk
@@ -0,0 +1,134 @@
+GRUB2_SUPPORTED_ARCH=n
+ifeq ($(ARCH),i386)
+GRUB2_SUPPORTED_ARCH=y
+endif
+ifeq ($(ARCH),i486)
+GRUB2_SUPPORTED_ARCH=y
+endif
+ifeq ($(ARCH),i586)
+GRUB2_SUPPORTED_ARCH=y
+endif
+ifeq ($(ARCH),i686)
+GRUB2_SUPPORTED_ARCH=y
+endif
+ifeq ($(ARCH),x86_64)
+GRUB2_SUPPORTED_ARCH=y
+endif
+ifeq ($(GRUB2_SUPPORTED_ARCH),y)
+#############################################################
+#
+# grub2
+#
+#############################################################
+GRUB2_SOURCE:=grub2_1.95.orig.tar.gz
+GRUB2_PATCH:=grub2_1.95-5.diff.gz
+GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
+GRUB2_PATCH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
+GRUB2_CAT:=$(ZCAT)
+GRUB2_DIR:=$(BUILD_DIR)/grub-1.95
+GRUB2_BINARY:=grub2/grub2
+GRUB2_TARGET_BINARY:=sbin/grub2
+GRUB2_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
+
+
+GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
+ifeq ($(BR2_LARGEFILE),)
+GRUB2_CFLAGS+=-U_FILE_OFFSET_BITS
+endif
+
+
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_SPLASH) += --enable-graphics
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_DISKLESS) += --enable-diskless
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c595) += --enable-3c595
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c90x) += --enable-3c90x
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_davicom) += --enable-davicom
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_e1000) += --enable-e1000
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_eepro100) += --enable-eepro100
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_epic100) += --enable-epic100
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_forcedeth) += --enable-forcedeth
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_natsemi) += --enable-natsemi
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns83820) += --enable-ns83820
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns8390) += --enable-ns8390
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pcnet32) += --enable-pcnet32
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pnic) += --enable-pnic
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_rtl8139) += --enable-rtl8139
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_r8169) += --enable-r8169
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_sis900) += --enable-sis900
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tg3) += --enable-tg3
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tulip) += --enable-tulip
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tlan) += --enable-tlan
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_undi) += --enable-undi
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_via_rhine) += --enable-via-rhine
+GRUB2_CONFIG-$(BR2_TARGET_GRUB2_w89c840) += --enable-w89c840
+
+$(DL_DIR)/$(GRUB2_SOURCE):
+	 $(call DOWNLOAD,$(GRUB2_SITE),$(GRUB2_SOURCE))
+
+$(DL_DIR)/$(GRUB2_PATCH):
+	 $(call DOWNLOAD,$(GRUB2_PATCH_SITE),$(GRUB2_PATCH))
+
+grub2-source: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
+
+$(GRUB2_DIR)/.unpacked: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
+	$(GRUB2_CAT) $(DL_DIR)/$(GRUB2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	toolchain/patch-kernel.sh $(GRUB2_DIR) $(DL_DIR) $(GRUB2_PATCH)
+	for i in `grep -v "^#" $(GRUB2_DIR)/debian/patches/00list`; do \
+		cat $(GRUB2_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB2_DIR); \
+	done
+	toolchain/patch-kernel.sh $(GRUB2_DIR) boot/grub2 grub-\*.patch
+	touch $@
+
+$(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked
+	(cd $(GRUB2_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		CPPFLAGS="$(GRUB2_CFLAGS)" \
+		grub_cv_i386_check_nested_functions=no \
+		./configure $(QUIET) \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/ \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-auto-linux-mem-opt \
+		$(DISABLE_LARGEFILE) \
+		$(GRUB2_CONFIG-y) \
+	)
+	touch $@
+
+$(GRUB2_DIR)/$(GRUB2_BINARY): $(GRUB2_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(GRUB2_DIR)
+
+$(GRUB2_DIR)/.installed: $(GRUB2_DIR)/$(GRUB2_BINARY)
+	cp $(GRUB2_DIR)/$(GRUB2_BINARY) $(TARGET_DIR)/$(GRUB2_TARGET_BINARY)
+	test -d $(TARGET_DIR)/boot/grub2 || mkdir -p $(TARGET_DIR)/boot/grub2
+	cp $(GRUB2_DIR)/stage1/stage1 $(GRUB2_DIR)/stage2/*1_5 $(GRUB2_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub2/
+ifeq ($(BR2_TARGET_GRUB2_SPLASH),y)
+	test -f $(TARGET_DIR)/boot/grub2/$(GRUB2_SPLASHIMAGE) || \
+		cp $(GRUB2_SPLASHIMAGE) $(TARGET_DIR)/boot/grub2/
+endif
+	touch $@
+
+grub2: uclibc $(GRUB2_DIR)/.installed
+
+grub2-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB2_DIR) uninstall
+	-$(MAKE) -C $(GRUB2_DIR) clean
+	rm -f $(TARGET_DIR)/boot/grub2/$(GRUB2_SPLASHIMAGE) \
+		$(TARGET_DIR)/sbin/$(GRUB2_BINARY) \
+		$(TARGET_DIR)/boot/grub2/{stage{1,2},*1_5}
+
+grub2-dirclean:
+	rm -rf $(GRUB2_DIR)
+
+endif
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_TARGET_GRUB2),y)
+TARGETS+=grub2
+endif
-- 
cgit v1.2.3


From 399131e62b658f0ac94e557292f596ced4483409 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 14 Mar 2010 18:42:05 +0100
Subject: grub2: remove GRUB2_ARCH_SUPPORTED

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub2/grub2.mk | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'boot/grub2')

diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 119397bb4..a298ae689 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -1,20 +1,3 @@
-GRUB2_SUPPORTED_ARCH=n
-ifeq ($(ARCH),i386)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i486)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i586)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),i686)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(ARCH),x86_64)
-GRUB2_SUPPORTED_ARCH=y
-endif
-ifeq ($(GRUB2_SUPPORTED_ARCH),y)
 #############################################################
 #
 # grub2
@@ -122,8 +105,6 @@ grub2-clean:
 grub2-dirclean:
 	rm -rf $(GRUB2_DIR)
 
-endif
-
 #############################################################
 #
 # Toplevel Makefile options
-- 
cgit v1.2.3


From e6b73b6548ffbed78b9979fe3b4f6f8848289749 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 15 Mar 2010 23:28:40 +0100
Subject: grub/grub2: drop unnecessary dependency on uclibc

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub/grub.mk   | 2 +-
 boot/grub2/grub2.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'boot/grub2')

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 96b082dcf..74ea77fb0 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -96,7 +96,7 @@ ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
 endif
 	touch $@
 
-grub: uclibc $(GRUB_DIR)/.installed
+grub: $(GRUB_DIR)/.installed
 
 grub-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB_DIR) uninstall
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index a298ae689..06e15240a 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -93,7 +93,7 @@ ifeq ($(BR2_TARGET_GRUB2_SPLASH),y)
 endif
 	touch $@
 
-grub2: uclibc $(GRUB2_DIR)/.installed
+grub2: $(GRUB2_DIR)/.installed
 
 grub2-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB2_DIR) uninstall
-- 
cgit v1.2.3


From bff56ab5484ac4d0ad593a20590cf570637f3f0c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 15 Mar 2010 23:48:48 +0100
Subject: grub/grub2: update splash image location

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub/grub.mk   | 2 +-
 boot/grub2/grub2.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'boot/grub2')

diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 74ea77fb0..3805afec6 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -11,7 +11,7 @@ GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97
 GRUB_BINARY:=grub/grub
 GRUB_TARGET_BINARY:=sbin/grub
-GRUB_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
+GRUB_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
 
 
 GRUB_CFLAGS=-DSUPPORT_LOOPDEV
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 06e15240a..24f1e1a27 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -11,7 +11,7 @@ GRUB2_CAT:=$(ZCAT)
 GRUB2_DIR:=$(BUILD_DIR)/grub-1.95
 GRUB2_BINARY:=grub2/grub2
 GRUB2_TARGET_BINARY:=sbin/grub2
-GRUB2_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
+GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
 
 
 GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
-- 
cgit v1.2.3


From 7aaf4e899531fa98d24eda698e76be4625e64c80 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 15 Mar 2010 23:58:19 +0100
Subject: grub2: bump version

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub2/grub2.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'boot/grub2')

diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 24f1e1a27..4af6c02b5 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -3,12 +3,12 @@
 # grub2
 #
 #############################################################
-GRUB2_SOURCE:=grub2_1.95.orig.tar.gz
-GRUB2_PATCH:=grub2_1.95-5.diff.gz
+GRUB2_SOURCE:=grub2_1.98.orig.tar.gz
+GRUB2_PATCH:=grub2_1.98-1.diff.gz
 GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
-GRUB2_PATCH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
+GRUB2_PATCH_SITE:=$(GRUB2_SITE)
 GRUB2_CAT:=$(ZCAT)
-GRUB2_DIR:=$(BUILD_DIR)/grub-1.95
+GRUB2_DIR:=$(BUILD_DIR)/grub-1.98
 GRUB2_BINARY:=grub2/grub2
 GRUB2_TARGET_BINARY:=sbin/grub2
 GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
-- 
cgit v1.2.3


From d36fbf1eda3baf5e1a875d8335e4ecef8aa10e65 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 16 Mar 2010 21:27:46 +0100
Subject: grub2: fix build

grub2 now builds fine, but some work remains to make it usable. What
should be installed exactly in the TARGET_DIR ? What is the
installation procedure and what should Buildroot do ?

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub2/grub-1.95-001-fix-grub-install.patch | 23 ------------
 boot/grub2/grub2.mk                             | 49 ++++++++++++++-----------
 2 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 boot/grub2/grub-1.95-001-fix-grub-install.patch

(limited to 'boot/grub2')

diff --git a/boot/grub2/grub-1.95-001-fix-grub-install.patch b/boot/grub2/grub-1.95-001-fix-grub-install.patch
deleted file mode 100644
index 3287b61c8..000000000
--- a/boot/grub2/grub-1.95-001-fix-grub-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-? config.status.lineno
-? fix-grub-install.diff
-? genkernsyms.sh
-? gensymlist.sh
-? grub-mkimage.d
-? grub_script.tab.c
-? grub_script.tab.h
-? kernel_elf_symlist.c
-Index: util/powerpc/ieee1275/grub-install.in
-===================================================================
-RCS file: /cvsroot/grub/grub2/util/powerpc/ieee1275/grub-install.in,v
-retrieving revision 1.5
-diff -u -r1.5 grub-install.in
---- grub-1.95/util/powerpc/ieee1275/grub-install.in	28 May 2006 23:01:43 -0000	1.5
-+++ grub-1.95/util/powerpc/ieee1275/grub-install.in	4 Mar 2007 19:05:47 -0000
-@@ -23,6 +23,7 @@
- # Initialize some variables.
- prefix=@prefix@
- exec_prefix=@exec_prefix@
-+bindir=@bindir@
- sbindir=@sbindir@
- libdir=@libdir@
- PACKAGE_NAME=@PACKAGE_NAME@
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 4af6c02b5..95fa24503 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -2,6 +2,15 @@
 #
 # grub2
 #
+# TODO
+#
+#  * grub2's autogen uses ruby, which isn't part of the core Debian
+#    installation. So either decide it is a requirement for Buildroot,
+#    or build it for the host.
+#
+#  * improve the installation procedure. For the moment, it just
+#    installs everything in $(TARGET_DIR).
+#
 #############################################################
 GRUB2_SOURCE:=grub2_1.98.orig.tar.gz
 GRUB2_PATCH:=grub2_1.98-1.diff.gz
@@ -13,13 +22,11 @@ GRUB2_BINARY:=grub2/grub2
 GRUB2_TARGET_BINARY:=sbin/grub2
 GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
 
-
 GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
 ifeq ($(BR2_LARGEFILE),)
 GRUB2_CFLAGS+=-U_FILE_OFFSET_BITS
 endif
 
-
 GRUB2_CONFIG-$(BR2_TARGET_GRUB2_SPLASH) += --enable-graphics
 GRUB2_CONFIG-$(BR2_TARGET_GRUB2_DISKLESS) += --enable-diskless
 GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c595) += --enable-3c595
@@ -53,16 +60,19 @@ $(DL_DIR)/$(GRUB2_PATCH):
 grub2-source: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
 
 $(GRUB2_DIR)/.unpacked: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH)
-	$(GRUB2_CAT) $(DL_DIR)/$(GRUB2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	toolchain/patch-kernel.sh $(GRUB2_DIR) $(DL_DIR) $(GRUB2_PATCH)
-	for i in `grep -v "^#" $(GRUB2_DIR)/debian/patches/00list`; do \
-		cat $(GRUB2_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB2_DIR); \
+	mkdir -p $(@D)
+	$(GRUB2_CAT) $(DL_DIR)/$(GRUB2_SOURCE) | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) -xvf -
+	toolchain/patch-kernel.sh $(@D) $(DL_DIR) $(GRUB2_PATCH)
+	for i in `grep -v "^#" $(@D)/debian/patches/00list`; do \
+		cat $(@D)/debian/patches/$$i | patch -p1 -d $(@D); \
 	done
-	toolchain/patch-kernel.sh $(GRUB2_DIR) boot/grub2 grub-\*.patch
+	toolchain/patch-kernel.sh $(@D) boot/grub2 grub-\*.patch
 	touch $@
 
 $(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked
 	(cd $(GRUB2_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) ; \
+		./autogen.sh ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		CPPFLAGS="$(GRUB2_CFLAGS)" \
@@ -74,33 +84,28 @@ $(GRUB2_DIR)/.configured: $(GRUB2_DIR)/.unpacked
 		--prefix=/ \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
-		--disable-auto-linux-mem-opt \
+		--disable-grub-mkfont \
+		--disable-grub-fstest \
+		--disable-grub-emu-usb \
+		--disable-werror \
 		$(DISABLE_LARGEFILE) \
 		$(GRUB2_CONFIG-y) \
 	)
 	touch $@
 
-$(GRUB2_DIR)/$(GRUB2_BINARY): $(GRUB2_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(GRUB2_DIR)
+$(GRUB2_DIR)/.compiled: $(GRUB2_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(@D)
+	touch $@
 
-$(GRUB2_DIR)/.installed: $(GRUB2_DIR)/$(GRUB2_BINARY)
-	cp $(GRUB2_DIR)/$(GRUB2_BINARY) $(TARGET_DIR)/$(GRUB2_TARGET_BINARY)
-	test -d $(TARGET_DIR)/boot/grub2 || mkdir -p $(TARGET_DIR)/boot/grub2
-	cp $(GRUB2_DIR)/stage1/stage1 $(GRUB2_DIR)/stage2/*1_5 $(GRUB2_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub2/
-ifeq ($(BR2_TARGET_GRUB2_SPLASH),y)
-	test -f $(TARGET_DIR)/boot/grub2/$(GRUB2_SPLASHIMAGE) || \
-		cp $(GRUB2_SPLASHIMAGE) $(TARGET_DIR)/boot/grub2/
-endif
+$(GRUB2_DIR)/.installed: $(GRUB2_DIR)/.compiled
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
 	touch $@
 
-grub2: $(GRUB2_DIR)/.installed
+grub2: host-automake host-autoconf $(GRUB2_DIR)/.installed
 
 grub2-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB2_DIR) uninstall
 	-$(MAKE) -C $(GRUB2_DIR) clean
-	rm -f $(TARGET_DIR)/boot/grub2/$(GRUB2_SPLASHIMAGE) \
-		$(TARGET_DIR)/sbin/$(GRUB2_BINARY) \
-		$(TARGET_DIR)/boot/grub2/{stage{1,2},*1_5}
 
 grub2-dirclean:
 	rm -rf $(GRUB2_DIR)
-- 
cgit v1.2.3


From 1d73ef9449f6ff0d5d3d9c93291c8869b27830cc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 17 Mar 2010 08:39:20 +0100
Subject: grub2: remove non-existing options

Much of the grub2.mk seems to have been copy/pasted from
grub.mk. However, all the network/splashimage related ./configure
options do not exist in grub2.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub2/Config.in |  9 ---------
 boot/grub2/grub2.mk  | 27 ---------------------------
 2 files changed, 36 deletions(-)

(limited to 'boot/grub2')

diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
index 752639993..d27cb4cd5 100644
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -2,12 +2,3 @@ config BR2_TARGET_GRUB2
 	bool "grub2"
 	help
 	  The GRand Unified Bootloader for x86 systems, take #2.
-
-config BR2_TARGET_GRUB2_SPLASH
-	bool "Splashimage support"
-	depends on BR2_TARGET_GRUB2
-	help
-	  Add support for splashimage.
-	
-	  A splashimage is a 14-color indexed .xpm picture which
-	  is displayed as background for the grub menu.
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 95fa24503..6c3bbefe3 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -18,39 +18,12 @@ GRUB2_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub2
 GRUB2_PATCH_SITE:=$(GRUB2_SITE)
 GRUB2_CAT:=$(ZCAT)
 GRUB2_DIR:=$(BUILD_DIR)/grub-1.98
-GRUB2_BINARY:=grub2/grub2
-GRUB2_TARGET_BINARY:=sbin/grub2
-GRUB2_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
 
 GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
 ifeq ($(BR2_LARGEFILE),)
 GRUB2_CFLAGS+=-U_FILE_OFFSET_BITS
 endif
 
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_SPLASH) += --enable-graphics
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_DISKLESS) += --enable-diskless
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c595) += --enable-3c595
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_3c90x) += --enable-3c90x
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_davicom) += --enable-davicom
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_e1000) += --enable-e1000
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_eepro100) += --enable-eepro100
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_epic100) += --enable-epic100
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_forcedeth) += --enable-forcedeth
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_natsemi) += --enable-natsemi
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns83820) += --enable-ns83820
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_ns8390) += --enable-ns8390
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pcnet32) += --enable-pcnet32
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_pnic) += --enable-pnic
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_rtl8139) += --enable-rtl8139
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_r8169) += --enable-r8169
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_sis900) += --enable-sis900
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tg3) += --enable-tg3
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tulip) += --enable-tulip
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_tlan) += --enable-tlan
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_undi) += --enable-undi
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_via_rhine) += --enable-via-rhine
-GRUB2_CONFIG-$(BR2_TARGET_GRUB2_w89c840) += --enable-w89c840
-
 $(DL_DIR)/$(GRUB2_SOURCE):
 	 $(call DOWNLOAD,$(GRUB2_SITE),$(GRUB2_SOURCE))
 
-- 
cgit v1.2.3


From 38a88b691834eece3fc9c0719d08b4f41ab2c474 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 31 May 2010 23:59:57 +0200
Subject: grub2: only available on x86 and PowerPC and mark as BROKEN

The build process of grub2 breaks the compilation. It breaks with:

./configure: line 4766: syntax error near unexpected token `external'
./configure: line 4766: `AM_GNU_GETTEXT(external)'

In addition to this, it later requires Ruby. Do we really want to make
Buildroot depend on Ruby being installed on the host ? Do we really
want to build our own Ruby ? Do we even care about Grub2 ?

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 boot/grub2/Config.in | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'boot/grub2')

diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
index d27cb4cd5..1301b5b80 100644
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -1,4 +1,9 @@
 config BR2_TARGET_GRUB2
 	bool "grub2"
+	# Only supports PC, Mac (Power, x86 and x86-64), Pegasos
+	depends on BR2_i386 || BR2_powerpc
+	# Build process is broken (./configure doesn't work, Ruby
+	# required, etc.)
+	depends on BROKEN
 	help
 	  The GRand Unified Bootloader for x86 systems, take #2.
-- 
cgit v1.2.3