Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2006-11-17 11:47 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-11-17 11:47 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-11-17 03:47:04 -0800 (Fri, 17 Nov 2006)
New Revision: 16554

Log:
- also allow grub for x86_64
- bump version


Modified:
   trunk/buildroot/target/x86/grub/Config.in
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/Config.in
===================================================================
--- trunk/buildroot/target/x86/grub/Config.in	2006-11-17 11:37:47 UTC (rev 16553)
+++ trunk/buildroot/target/x86/grub/Config.in	2006-11-17 11:47:04 UTC (rev 16554)
@@ -1,7 +1,7 @@
 config BR2_TARGET_GRUB
 	bool "grub"
 	default n
-	depends on BR2_i386
+	depends on BR2_i386 || BR2_x86_64
 	help
 	  The GRand Unified Bootloader for x86 systems.
 

Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2006-11-17 11:37:47 UTC (rev 16553)
+++ trunk/buildroot/target/x86/grub/grub.mk	2006-11-17 11:47:04 UTC (rev 16554)
@@ -1,20 +1,38 @@
+GRUB_SUPPORTED_ARCH=n
 ifeq ($(ARCH),i386)
+GRUB_SUPPORTED_ARCH=y
+endif
+ifeq ($(ARCH),i486)
+GRUB_SUPPORTED_ARCH=y
+endif
+ifeq ($(ARCH),i586)
+GRUB_SUPPORTED_ARCH=y
+endif
+ifeq ($(ARCH),i686)
+GRUB_SUPPORTED_ARCH=y
+endif
+ifeq ($(ARCH),x86_64)
+GRUB_SUPPORTED_ARCH=y
+endif
+ifeq ($(GRUB_SUPPORTED_ARCH),y)
 #############################################################
 #
 # grub
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH=grub_0.97-5.diff.gz
+GRUB_PATCH=grub_0.97-18.diff.gz
 GRUB_SITE=http://ftp.debian.org/debian/pool/main/g/grub
 GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97
 GRUB_BINARY:=grub/grub
 GRUB_TARGET_BINARY:=bin/grub
 
+GRUB_TARGET_FILES:=
 ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
 GRUB_CONFIGURE_ARGS+=--enable-graphics
-GRUB_SPLASHIMAGE=splash.xpm.gz
+GRUB_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
+GRUB_TARGET_FILES+=$(GRUB_SPLASHIMAGE)
 endif
 GRUB_CFLAGS=-DSUPPORT_LOOPDEV
 
@@ -56,7 +74,11 @@
 	$(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR)
 
 grub-target_binary: $(GRUB_DIR)/$(GRUB_BINARY)
+	cp $(GRUB_DIR)/$(GRUB_BINARY) $(TARGET_DIR)/sbin/
+	test -d $(TARGET_DIR)/boot/grub || mkdir -p $(TARGET_DIR)/boot/grub
+	cp $(GRUB_DIR)/stage1/stage1 $(GRUB_DIR)/stage2/*1_5 $(GRUB_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub/
 
+
 grub: grub-target_binary
 
 grub-clean:

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2006-11-22 15:22 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-11-22 15:22 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-11-22 07:22:31 -0800 (Wed, 22 Nov 2006)
New Revision: 16619

Log:
- bump version


Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2006-11-22 09:39:48 UTC (rev 16618)
+++ trunk/buildroot/target/x86/grub/grub.mk	2006-11-22 15:22:31 UTC (rev 16619)
@@ -21,7 +21,7 @@
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH=grub_0.97-18.diff.gz
+GRUB_PATCH=grub_0.97-19.diff.gz
 GRUB_SITE=http://ftp.debian.org/debian/pool/main/g/grub
 GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2006-11-29 12:17 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-11-29 12:17 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-11-29 04:17:26 -0800 (Wed, 29 Nov 2006)
New Revision: 16717

Log:
- fix typo in grub-clean


Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2006-11-29 12:00:28 UTC (rev 16716)
+++ trunk/buildroot/target/x86/grub/grub.mk	2006-11-29 12:17:26 UTC (rev 16717)
@@ -83,7 +83,7 @@
 
 grub-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB_DIR) uninstall
-	-grub -C $(GRUB_DIR) clean
+	-$(MAKE) -C $(GRUB_DIR) clean
 
 grub-dirclean:
 	rm -rf $(GRUB_DIR)

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2006-11-29 20:26 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-11-29 20:26 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-11-29 12:26:05 -0800 (Wed, 29 Nov 2006)
New Revision: 16727

Log:
- honor uclibc's notion of LFS support


Added:
   trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch

Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Added: trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
===================================================================
--- trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch	2006-11-29 19:28:41 UTC (rev 16726)
+++ trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch	2006-11-29 20:26:05 UTC (rev 16727)
@@ -0,0 +1,34 @@
+diff -rup grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c
+--- grub-0.97.orig/grub/asmstub.c	2006-11-29 20:36:20.000000000 +0100
++++ grub-0.97/grub/asmstub.c	2006-11-29 21:26:16.000000000 +0100
+@@ -18,10 +18,13 @@
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <features.h>
++#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
+ /* Try to use glibc's transparant LFS support. */
+ #define _LARGEFILE_SOURCE	1
+ /* lseek becomes synonymous with lseek64.  */
+ #define _FILE_OFFSET_BITS	64
++#endif
+ 
+ /* Simulator entry point. */
+ int grub_stage2 (void);
+diff -rup grub-0.97.orig/lib/device.c grub-0.97/lib/device.c
+--- grub-0.97.orig/lib/device.c	2006-11-29 20:36:20.000000000 +0100
++++ grub-0.97/lib/device.c	2006-11-29 21:25:19.000000000 +0100
+@@ -18,10 +18,13 @@
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <features.h>
++#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
+ /* Try to use glibc's transparant LFS support. */
+ #define _LARGEFILE_SOURCE       1
+ /* lseek becomes synonymous with lseek64.  */
+ #define _FILE_OFFSET_BITS       64
++#endif
+ 
+ #include <stdio.h>
+ #include <stdlib.h>

Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2006-11-29 19:28:41 UTC (rev 16726)
+++ trunk/buildroot/target/x86/grub/grub.mk	2006-11-29 20:26:05 UTC (rev 16727)
@@ -36,6 +36,10 @@
 endif
 GRUB_CFLAGS=-DSUPPORT_LOOPDEV
 
+ifeq ($(BR2_LARGEFILE),)
+GRUB_CFLAGS+=-U_FILE_OFFSET_BITS
+endif
+
 $(DL_DIR)/$(GRUB_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(GRUB_SITE)/$(GRUB_SOURCE)
 

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2006-12-20 17:08 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2006-12-20 17:08 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2006-12-20 09:08:38 -0800 (Wed, 20 Dec 2006)
New Revision: 17019

Log:
- bump patch version


Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2006-12-20 16:50:04 UTC (rev 17018)
+++ trunk/buildroot/target/x86/grub/grub.mk	2006-12-20 17:08:38 UTC (rev 17019)
@@ -21,7 +21,7 @@
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH=grub_0.97-19.diff.gz
+GRUB_PATCH=grub_0.97-20.diff.gz
 GRUB_SITE=http://ftp.debian.org/debian/pool/main/g/grub
 GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2007-01-29 18:34 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-01-29 18:34 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-01-29 10:34:37 -0800 (Mon, 29 Jan 2007)
New Revision: 17642

Log:
- added diskless/net support and new patches, mainly network drivers.
  Closes #721. Thanks, janlana


Added:
   trunk/buildroot/target/x86/grub/grub.400-nic_update2.patch.bz2

Modified:
   trunk/buildroot/target/x86/grub/Config.in
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/Config.in
===================================================================
--- trunk/buildroot/target/x86/grub/Config.in	2007-01-29 18:03:54 UTC (rev 17641)
+++ trunk/buildroot/target/x86/grub/Config.in	2007-01-29 18:34:37 UTC (rev 17642)
@@ -15,3 +15,156 @@
 	  A splashimage is a 14-color indexed .xpm picture which
 	  is displayed as background for the grub menu.
 
+config BR2_TARGET_GRUB_DISKLESS
+	bool "enable diskless support"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable diskless support
+
+config BR2_TARGET_GRUB_3c595
+	bool "enable 3Com595 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable 3Com595 driver
+
+config BR2_TARGET_GRUB_3c90x
+	bool "enable 3Com90x driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable 3Com90x driver
+
+config BR2_TARGET_GRUB_davicom
+	bool "enable Davicom driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Davicom driver
+
+config BR2_TARGET_GRUB_e1000
+	bool "enable Etherexpress Pro/1000 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Etherexpress Pro/1000 driver
+
+config BR2_TARGET_GRUB_eepro100
+	bool "enable Etherexpress Pro/100 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Etherexpress Pro/100 driver
+
+config BR2_TARGET_GRUB_epic100
+	bool "enable SMC 83c170 EPIC/100 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable SMC 83c170 EPIC/100 driver
+
+config BR2_TARGET_GRUB_forcedeth
+	bool "enable Nvidia Geforce driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Nvidia Geforce driver
+
+config BR2_TARGET_GRUB_natsemi
+	bool "enable NatSemi DP8381x driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable NatSemi DP8381x driver
+
+config BR2_TARGET_GRUB_ns83820
+	bool "enable NS83820 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable NS83820 driver
+
+config BR2_TARGET_GRUB_ns8390
+	bool "enable NE2000 PCI driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable NE2000 PCI driver
+
+config BR2_TARGET_GRUB_pcnet32
+	bool "enable AMD Lance/PCI PCNet/32 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable AMD Lance/PCI PCNet/32 driver
+
+config BR2_TARGET_GRUB_pnic
+	bool "enable Bochs Pseudo Nic driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Bochs Pseudo Nic driver
+
+config BR2_TARGET_GRUB_rtl8139
+	bool "enable Realtek 8139 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Realtek 8139 driver
+
+config BR2_TARGET_GRUB_r8169
+	bool "enable Realtek 8169 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Realtek 8169 driver
+
+config BR2_TARGET_GRUB_sis900
+	bool "enable SIS 900 and SIS 7016 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable SIS 900 and SIS 7016 driver
+
+config BR2_TARGET_GRUB_tg3
+	bool "enable Broadcom Tigon3 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Broadcom Tigon3 driver
+
+config BR2_TARGET_GRUB_tulip
+	bool "enable Tulip driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Tulip driver
+
+config BR2_TARGET_GRUB_tlan
+	bool "enable TI ThunderLAN driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable TI ThunderLAN driver
+
+config BR2_TARGET_GRUB_undi
+	bool "enable PXE UNDI driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable PXE UNDI driver
+
+config BR2_TARGET_GRUB_via_rhine
+	bool "enable Rhine-I/II driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Rhine-I/II driver
+
+config BR2_TARGET_GRUB_w89c840
+	bool "enable Winbond W89c840 driver"
+	default n
+	depends on BR2_TARGET_GRUB
+	help
+	  enable Winbond W89c840 driver

Added: trunk/buildroot/target/x86/grub/grub.400-nic_update2.patch.bz2
===================================================================
(Binary files differ)


Property changes on: trunk/buildroot/target/x86/grub/grub.400-nic_update2.patch.bz2
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2007-01-29 18:03:54 UTC (rev 17641)
+++ trunk/buildroot/target/x86/grub/grub.mk	2007-01-29 18:34:37 UTC (rev 17642)
@@ -21,41 +21,62 @@
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH=grub_0.97-20.diff.gz
+GRUB_PATCH:=grub_0.97-20.diff.gz
 GRUB_SITE=http://ftp.debian.org/debian/pool/main/g/grub
+GRUB_PATCH_SITE:=http://ftp.debian.org/debian/pool/main/g/grub
 GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97
 GRUB_BINARY:=grub/grub
 GRUB_TARGET_BINARY:=bin/grub
+GRUB_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
 
-GRUB_TARGET_FILES:=
-ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
-GRUB_CONFIGURE_ARGS+=--enable-graphics
-GRUB_SPLASHIMAGE=$(TOPDIR)/target/x86/grub/splash.xpm.gz
-GRUB_TARGET_FILES+=$(GRUB_SPLASHIMAGE)
-endif
+
 GRUB_CFLAGS=-DSUPPORT_LOOPDEV
-
 ifeq ($(BR2_LARGEFILE),)
 GRUB_CFLAGS+=-U_FILE_OFFSET_BITS
 endif
 
+
+GRUB_CONFIG-$(BR2_TARGET_GRUB_SPLASH) += --enable-graphics
+GRUB_CONFIG-$(BR2_TARGET_GRUB_DISKLESS) += --enable-diskless
+GRUB_CONFIG-$(BR2_TARGET_GRUB_3c595) += --enable-3c595
+GRUB_CONFIG-$(BR2_TARGET_GRUB_3c90x) += --enable-3c90x
+GRUB_CONFIG-$(BR2_TARGET_GRUB_davicom) += --enable-davicom
+GRUB_CONFIG-$(BR2_TARGET_GRUB_e1000) += --enable-e1000
+GRUB_CONFIG-$(BR2_TARGET_GRUB_eepro100) += --enable-eepro100
+GRUB_CONFIG-$(BR2_TARGET_GRUB_epic100) += --enable-epic100
+GRUB_CONFIG-$(BR2_TARGET_GRUB_forcedeth) += --enable-forcedeth
+GRUB_CONFIG-$(BR2_TARGET_GRUB_natsemi) += --enable-natsemi
+GRUB_CONFIG-$(BR2_TARGET_GRUB_ns83820) += --enable-ns83820
+GRUB_CONFIG-$(BR2_TARGET_GRUB_ns8390) += --enable-ns8390
+GRUB_CONFIG-$(BR2_TARGET_GRUB_pcnet32) += --enable-pcnet32
+GRUB_CONFIG-$(BR2_TARGET_GRUB_pnic) += --enable-pnic
+GRUB_CONFIG-$(BR2_TARGET_GRUB_rtl8139) += --enable-rtl8139
+GRUB_CONFIG-$(BR2_TARGET_GRUB_r8169) += --enable-r8169
+GRUB_CONFIG-$(BR2_TARGET_GRUB_sis900) += --enable-sis900
+GRUB_CONFIG-$(BR2_TARGET_GRUB_tg3) += --enable-tg3
+GRUB_CONFIG-$(BR2_TARGET_GRUB_tulip) += --enable-tulip
+GRUB_CONFIG-$(BR2_TARGET_GRUB_tlan) += --enable-tlan
+GRUB_CONFIG-$(BR2_TARGET_GRUB_undi) += --enable-undi
+GRUB_CONFIG-$(BR2_TARGET_GRUB_via_rhine) += --enable-via-rhine
+GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
+
 $(DL_DIR)/$(GRUB_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(GRUB_SITE)/$(GRUB_SOURCE)
 
 $(DL_DIR)/$(GRUB_PATCH):
-	 $(WGET) -P $(DL_DIR) $(GRUB_SITE)/$(GRUB_PATCH)
+	 $(WGET) -P $(DL_DIR) $(GRUB_PATCH_SITE)/$(GRUB_PATCH)
 
 grub-source: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH)
 
 $(GRUB_DIR)/.unpacked: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH)
 	$(GRUB_CAT) $(DL_DIR)/$(GRUB_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	$(GRUB_CAT) $(DL_DIR)/$(GRUB_PATCH)  | patch -p1 -d $(GRUB_DIR)
+	toolchain/patch-kernel.sh $(GRUB_DIR) $(DL_DIR) $(GRUB_PATCH)
 	for i in `grep -v "^#" $(GRUB_DIR)/debian/patches/00list`; do \
 		cat $(GRUB_DIR)/debian/patches/$$i | patch -p1 -d $(GRUB_DIR); \
 	done
-	toolchain/patch-kernel.sh $(GRUB_DIR) target/x86/grub/ grub\*.patch
-	touch $(GRUB_DIR)/.unpacked
+	toolchain/patch-kernel.sh $(GRUB_DIR) target/x86/grub grub.\*.patch{,.bz2}
+	touch $@
 
 $(GRUB_DIR)/.configured: $(GRUB_DIR)/.unpacked
 	(cd $(GRUB_DIR); rm -rf config.cache; \
@@ -70,9 +91,9 @@
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--disable-auto-linux-mem-opt \
-		$(GRUB_CONFIGURE_ARGS) \
+		$(GRUB_CONFIG-y) \
 	);
-	touch  $(GRUB_DIR)/.configured
+	touch  $@
 
 $(GRUB_DIR)/$(GRUB_BINARY): $(GRUB_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR)
@@ -81,13 +102,19 @@
 	cp $(GRUB_DIR)/$(GRUB_BINARY) $(TARGET_DIR)/sbin/
 	test -d $(TARGET_DIR)/boot/grub || mkdir -p $(TARGET_DIR)/boot/grub
 	cp $(GRUB_DIR)/stage1/stage1 $(GRUB_DIR)/stage2/*1_5 $(GRUB_DIR)/stage2/stage2 $(TARGET_DIR)/boot/grub/
+ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
+	test -f $(TARGET_DIR)/boot/grub/$(GRUB_SPLASHIMAGE) || \
+		cp $(GRUB_SPLASHIMAGE) $(TARGET_DIR)/boot/grub/
+endif
 
-
 grub: grub-target_binary
 
 grub-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GRUB_DIR) uninstall
 	-$(MAKE) -C $(GRUB_DIR) clean
+	rm -f $(TARGET_DIR)/boot/grub/$(GRUB_SPLASHIMAGE) \
+		$(TARGET_DIR)/sbin/$(GRUB_BINARY) \
+		$(TARGET_DIR)/boot/grub/{stage{1,2},*1_5}
 
 grub-dirclean:
 	rm -rf $(GRUB_DIR)

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2007-01-29 22:12 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-01-29 22:12 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-01-29 14:12:53 -0800 (Mon, 29 Jan 2007)
New Revision: 17649

Log:
- strip a handful of enable


Modified:
   trunk/buildroot/target/x86/grub/Config.in


Changeset:
Modified: trunk/buildroot/target/x86/grub/Config.in
===================================================================
--- trunk/buildroot/target/x86/grub/Config.in	2007-01-29 21:53:20 UTC (rev 17648)
+++ trunk/buildroot/target/x86/grub/Config.in	2007-01-29 22:12:53 UTC (rev 17649)
@@ -6,7 +6,7 @@
 	  The GRand Unified Bootloader for x86 systems.
 
 config BR2_TARGET_GRUB_SPLASH
-	bool "  Splashimage support"
+	bool "Splashimage support"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
@@ -16,154 +16,154 @@
 	  is displayed as background for the grub menu.
 
 config BR2_TARGET_GRUB_DISKLESS
-	bool "enable diskless support"
+	bool "diskless support"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable diskless support
 
 config BR2_TARGET_GRUB_3c595
-	bool "enable 3Com595 driver"
+	bool "3Com595 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable 3Com595 driver
 
 config BR2_TARGET_GRUB_3c90x
-	bool "enable 3Com90x driver"
+	bool "3Com90x driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable 3Com90x driver
 
 config BR2_TARGET_GRUB_davicom
-	bool "enable Davicom driver"
+	bool "Davicom driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Davicom driver
 
 config BR2_TARGET_GRUB_e1000
-	bool "enable Etherexpress Pro/1000 driver"
+	bool "Etherexpress Pro/1000 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Etherexpress Pro/1000 driver
 
 config BR2_TARGET_GRUB_eepro100
-	bool "enable Etherexpress Pro/100 driver"
+	bool "Etherexpress Pro/100 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Etherexpress Pro/100 driver
 
 config BR2_TARGET_GRUB_epic100
-	bool "enable SMC 83c170 EPIC/100 driver"
+	bool "SMC 83c170 EPIC/100 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable SMC 83c170 EPIC/100 driver
 
 config BR2_TARGET_GRUB_forcedeth
-	bool "enable Nvidia Geforce driver"
+	bool "Nvidia Geforce driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Nvidia Geforce driver
 
 config BR2_TARGET_GRUB_natsemi
-	bool "enable NatSemi DP8381x driver"
+	bool "NatSemi DP8381x driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable NatSemi DP8381x driver
 
 config BR2_TARGET_GRUB_ns83820
-	bool "enable NS83820 driver"
+	bool "NS83820 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable NS83820 driver
 
 config BR2_TARGET_GRUB_ns8390
-	bool "enable NE2000 PCI driver"
+	bool "NE2000 PCI driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable NE2000 PCI driver
 
 config BR2_TARGET_GRUB_pcnet32
-	bool "enable AMD Lance/PCI PCNet/32 driver"
+	bool "AMD Lance/PCI PCNet/32 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable AMD Lance/PCI PCNet/32 driver
 
 config BR2_TARGET_GRUB_pnic
-	bool "enable Bochs Pseudo Nic driver"
+	bool "Bochs Pseudo Nic driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Bochs Pseudo Nic driver
 
 config BR2_TARGET_GRUB_rtl8139
-	bool "enable Realtek 8139 driver"
+	bool "Realtek 8139 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Realtek 8139 driver
 
 config BR2_TARGET_GRUB_r8169
-	bool "enable Realtek 8169 driver"
+	bool "Realtek 8169 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Realtek 8169 driver
 
 config BR2_TARGET_GRUB_sis900
-	bool "enable SIS 900 and SIS 7016 driver"
+	bool "SIS 900 and SIS 7016 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable SIS 900 and SIS 7016 driver
 
 config BR2_TARGET_GRUB_tg3
-	bool "enable Broadcom Tigon3 driver"
+	bool "Broadcom Tigon3 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Broadcom Tigon3 driver
 
 config BR2_TARGET_GRUB_tulip
-	bool "enable Tulip driver"
+	bool "Tulip driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Tulip driver
 
 config BR2_TARGET_GRUB_tlan
-	bool "enable TI ThunderLAN driver"
+	bool "TI ThunderLAN driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable TI ThunderLAN driver
 
 config BR2_TARGET_GRUB_undi
-	bool "enable PXE UNDI driver"
+	bool "PXE UNDI driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable PXE UNDI driver
 
 config BR2_TARGET_GRUB_via_rhine
-	bool "enable Rhine-I/II driver"
+	bool "Rhine-I/II driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help
 	  enable Rhine-I/II driver
 
 config BR2_TARGET_GRUB_w89c840
-	bool "enable Winbond W89c840 driver"
+	bool "Winbond W89c840 driver"
 	default n
 	depends on BR2_TARGET_GRUB
 	help

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2007-02-07 10:43 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-02-07 10:43 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-02-07 02:43:04 -0800 (Wed, 07 Feb 2007)
New Revision: 17805

Log:
- bump patch version. Thanks to Alexander Rigbo for pointing this out.


Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2007-02-07 02:51:45 UTC (rev 17804)
+++ trunk/buildroot/target/x86/grub/grub.mk	2007-02-07 10:43:04 UTC (rev 17805)
@@ -21,7 +21,7 @@
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH:=grub_0.97-20.diff.gz
+GRUB_PATCH:=grub_0.97-22.diff.gz
 GRUB_SITE=http://ftp.debian.org/debian/pool/main/g/grub
 GRUB_PATCH_SITE:=http://ftp.debian.org/debian/pool/main/g/grub
 GRUB_CAT:=$(ZCAT)

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2007-05-15 11:39 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-05-15 11:39 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-05-15 04:39:44 -0700 (Tue, 15 May 2007)
New Revision: 18626

Log:
- bump patch version


Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2007-05-15 11:33:08 UTC (rev 18625)
+++ trunk/buildroot/target/x86/grub/grub.mk	2007-05-15 11:39:44 UTC (rev 18626)
@@ -21,7 +21,7 @@
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH:=grub_0.97-22.diff.gz
+GRUB_PATCH:=grub_0.97-28.diff.gz
 GRUB_SITE=http://ftp.debian.org/debian/pool/main/g/grub
 GRUB_PATCH_SITE:=http://ftp.debian.org/debian/pool/main/g/grub
 GRUB_CAT:=$(ZCAT)

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2007-09-30 18:06 aldot at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: aldot at uclibc.org @ 2007-09-30 18:06 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-09-30 11:06:32 -0700 (Sun, 30 Sep 2007)
New Revision: 20150

Log:
- put a static grub into the staging dir


Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2007-09-30 17:55:43 UTC (rev 20149)
+++ trunk/buildroot/target/x86/grub/grub.mk	2007-09-30 18:06:32 UTC (rev 20150)
@@ -97,6 +97,11 @@
 
 $(GRUB_DIR)/$(GRUB_BINARY): $(GRUB_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR)
+	rm -f $(GRUB_DIR)/$(GRUB_BINARY)
+	$(MAKE) CC=$(TARGET_CC) CFLAGS+=-static -C $(GRUB_DIR)/grub grub
+	mkdir -p $(dir $(STAGING_DIR)/$(GRUB_TARGET_BINARY))
+	mv $(GRUB_DIR)/$(GRUB_BINARY) $(STAGING_DIR)/$(GRUB_TARGET_BINARY).static
+	$(MAKE) CC=$(TARGET_CC) -C $(GRUB_DIR)/grub
 
 $(GRUB_DIR)/.installed: $(GRUB_DIR)/$(GRUB_BINARY)
 	cp $(GRUB_DIR)/$(GRUB_BINARY) $(TARGET_DIR)/$(GRUB_TARGET_BINARY)

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2008-02-22 19:37 sjhill at uclibc.org
  2008-02-28 15:25 ` Fathi Boudra
  0 siblings, 1 reply; 17+ messages in thread
From: sjhill at uclibc.org @ 2008-02-22 19:37 UTC (permalink / raw)
  To: buildroot

Author: sjhill
Date: 2008-02-22 11:37:39 -0800 (Fri, 22 Feb 2008)
New Revision: 21086

Log:
Update diff version.


Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2008-02-21 04:35:14 UTC (rev 21085)
+++ trunk/buildroot/target/x86/grub/grub.mk	2008-02-22 19:37:39 UTC (rev 21086)
@@ -21,7 +21,7 @@
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH:=grub_0.97-28.diff.gz
+GRUB_PATCH:=grub_0.97-31.diff.gz
 GRUB_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub
 GRUB_PATCH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub
 GRUB_CAT:=$(ZCAT)

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2008-05-01 17:14 ninevoltz at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: ninevoltz at uclibc.org @ 2008-05-01 17:14 UTC (permalink / raw)
  To: buildroot

Author: ninevoltz
Date: 2008-05-01 10:14:46 -0700 (Thu, 01 May 2008)
New Revision: 21909

Log:
add menu.lst for grub

Added:
   trunk/buildroot/target/x86/grub/menu.lst


Changeset:
Added: trunk/buildroot/target/x86/grub/menu.lst
===================================================================
--- trunk/buildroot/target/x86/grub/menu.lst	                        (rev 0)
+++ trunk/buildroot/target/x86/grub/menu.lst	2008-05-01 17:14:46 UTC (rev 21909)
@@ -0,0 +1,7 @@
+default=0
+timeout=5
+splashimage=(hd0,0)/boot/grub/splash.xpm.gz
+hiddenmenu
+title Buildroot
+	root (hd0,0)
+	kernel /boot/bzImage rw root=/dev/hda1 vga=791 

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2008-05-12 18:56 nkukard at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: nkukard at uclibc.org @ 2008-05-12 18:56 UTC (permalink / raw)
  To: buildroot

Author: nkukard
Date: 2008-05-12 11:56:11 -0700 (Mon, 12 May 2008)
New Revision: 21974

Log:
features.h should never be included explicitly. 
This fixes the bug where "File not found" error is reported by grub.
This fix works under both uclibc and glibc.


Modified:
   trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
===================================================================
--- trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch	2008-05-12 14:35:56 UTC (rev 21973)
+++ trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch	2008-05-12 18:56:11 UTC (rev 21974)
@@ -5,7 +5,7 @@
   *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
-+#include <features.h>
++/* #include <features.h> - NK */
 +#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
  /* Try to use glibc's transparant LFS support. */
  #define _LARGEFILE_SOURCE	1
@@ -22,7 +22,7 @@
   *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
-+#include <features.h>
++/* #include <features.h> - NK */
 +#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
  /* Try to use glibc's transparant LFS support. */
  #define _LARGEFILE_SOURCE       1

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2008-11-08 22:24 tpetazzoni at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: tpetazzoni at uclibc.org @ 2008-11-08 22:24 UTC (permalink / raw)
  To: buildroot

Author: tpetazzoni
Date: 2008-11-08 14:24:39 -0800 (Sat, 08 Nov 2008)
New Revision: 23968

Log:
Fix Grub tarball version as the current version has disappeared from
Debian mirrors.

Patch provided by Roberto A. Foglietta <roberto.foglietta@gmail.com>



Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2008-11-08 21:42:14 UTC (rev 23967)
+++ trunk/buildroot/target/x86/grub/grub.mk	2008-11-08 22:24:39 UTC (rev 23968)
@@ -21,7 +21,7 @@
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH:=grub_0.97-35.diff.gz
+GRUB_PATCH:=grub_0.97-51.diff.gz
 GRUB_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub
 GRUB_PATCH_SITE:=$(GRUB_SITE)
 GRUB_CAT:=$(ZCAT)

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2009-01-31 12:29 jacmet at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: jacmet at uclibc.org @ 2009-01-31 12:29 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2009-01-31 12:29:55 +0000 (Sat, 31 Jan 2009)
New Revision: 25177

Log:
grub: fix build

Revert to the -35 debian patch (from stable.debian.net) so the other
patches apply, E.G. effectively revert r23968.

Someone who actually uses grub should probably look into updating our
version.

Modified:
   trunk/buildroot/target/x86/grub/grub.mk


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.mk
===================================================================
--- trunk/buildroot/target/x86/grub/grub.mk	2009-01-31 12:02:40 UTC (rev 25176)
+++ trunk/buildroot/target/x86/grub/grub.mk	2009-01-31 12:29:55 UTC (rev 25177)
@@ -21,8 +21,8 @@
 #
 #############################################################
 GRUB_SOURCE:=grub_0.97.orig.tar.gz
-GRUB_PATCH:=grub_0.97-51.diff.gz
-GRUB_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/g/grub
+GRUB_PATCH:=grub_0.97-35.diff.gz
+GRUB_SITE:=http://snapshot.debian.net/archive/2008/03/29/debian/pool/main/g/grub/
 GRUB_PATCH_SITE:=$(GRUB_SITE)
 GRUB_CAT:=$(ZCAT)
 GRUB_DIR:=$(BUILD_DIR)/grub-0.97

^ permalink raw reply	[flat|nested] 17+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/x86/grub
@ 2009-01-31 12:30 jacmet at uclibc.org
  0 siblings, 0 replies; 17+ messages in thread
From: jacmet at uclibc.org @ 2009-01-31 12:30 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2009-01-31 12:30:02 +0000 (Sat, 31 Jan 2009)
New Revision: 25178

Log:
grub: revert r21974 (features.h should never be included explicitly)

features.h (or something including it) is needed for __UCLIBC* to get
defined - E.G. without that the build breaks without largefile support.

Nigel, what was the reason for your commit and what file not found error
did you see?

Modified:
   trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch


Changeset:
Modified: trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
===================================================================
--- trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch	2009-01-31 12:29:55 UTC (rev 25177)
+++ trunk/buildroot/target/x86/grub/grub.300-honor_UCLIBC_HAS_LFS.patch	2009-01-31 12:30:02 UTC (rev 25178)
@@ -5,7 +5,7 @@
   *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
-+/* #include <features.h> - NK */
++#include <features.h>
 +#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
  /* Try to use glibc's transparant LFS support. */
  #define _LARGEFILE_SOURCE	1
@@ -22,7 +22,7 @@
   *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
-+/* #include <features.h> - NK */
++#include <features.h>
 +#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
  /* Try to use glibc's transparant LFS support. */
  #define _LARGEFILE_SOURCE       1

^ permalink raw reply	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2009-01-31 12:30 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-17 11:47 [Buildroot] svn commit: trunk/buildroot/target/x86/grub aldot at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
2006-11-22 15:22 aldot at uclibc.org
2006-11-29 12:17 aldot at uclibc.org
2006-11-29 20:26 aldot at uclibc.org
2006-12-20 17:08 aldot at uclibc.org
2007-01-29 18:34 aldot at uclibc.org
2007-01-29 22:12 aldot at uclibc.org
2007-02-07 10:43 aldot at uclibc.org
2007-05-15 11:39 aldot at uclibc.org
2007-09-30 18:06 aldot at uclibc.org
2008-02-22 19:37 sjhill at uclibc.org
2008-02-28 15:25 ` Fathi Boudra
2008-05-01 17:14 ninevoltz at uclibc.org
2008-05-12 18:56 nkukard at uclibc.org
2008-11-08 22:24 tpetazzoni at uclibc.org
2009-01-31 12:29 jacmet at uclibc.org
2009-01-31 12:30 jacmet at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox