Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: aldot at uclibc.org <aldot@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/target/x86/grub
Date: Fri, 17 Nov 2006 03:47:04 -0800 (PST)	[thread overview]
Message-ID: <20061117114704.778C848612@busybox.net> (raw)

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:

             reply	other threads:[~2006-11-17 11:47 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-17 11:47 aldot at uclibc.org [this message]
  -- strict thread matches above, loose matches on Subject: below --
2006-11-22 15:22 [Buildroot] svn commit: trunk/buildroot/target/x86/grub 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061117114704.778C848612@busybox.net \
    --to=aldot@uclibc.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox