pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update grub to 0.94:
details: https://anonhg.NetBSD.org/pkgsrc/rev/21c7f0257bd5
branches: trunk
changeset: 467357:21c7f0257bd5
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Thu Jan 29 18:36:38 2004 +0000
description:
Update grub to 0.94:
* Support building on x86-64 with gcc -m32.
* Use a BIOS call to turn on/off Gate A20. This should solve various
problems related to Gate A20 in modern BIOSes.
* Add a workaround for buggy BIOSes (notably HP Vectra series) which
don't pass the boot drive correctly.
* Display "GNU GRUB" instead of "GRUB" in the menu.
* Add support for QNX RTP into the grub shell.
* Add support for the initrd max address of a kernel header in Linux.
* Support 32 bit and 64 bit dev_t.
* Add support for an install device in GRUB's notation with no
parenthesis (e.g. grub-install hd0).
* Improve the manual a lot.
While here, add a new build definition, GRUB_PRESET_COMMAND, which can be
set to a single command that will be embedded in grub's stage2 and executed
during bootup (useful for automated diskless setups). Also make use of
BUILD_DEFS properly. And pick up maintainership, as requested by tron@.
diffstat:
mk/bsd.pkg.defaults.mk | 10 ++-
sysutils/grub/Makefile | 27 ++++-
sysutils/grub/distinfo | 16 +---
sysutils/grub/patches/patch-ac | 166 -----------------------------------------
sysutils/grub/patches/patch-ad | 166 -----------------------------------------
sysutils/grub/patches/patch-ae | 13 ---
sysutils/grub/patches/patch-af | 13 ---
sysutils/grub/patches/patch-ag | 13 ---
sysutils/grub/patches/patch-ah | 13 ---
sysutils/grub/patches/patch-ak | 13 ---
sysutils/grub/patches/patch-am | 19 ----
sysutils/grub/patches/patch-an | 26 ------
sysutils/grub/patches/patch-ao | 15 ---
13 files changed, 31 insertions(+), 479 deletions(-)
diffs (truncated from 607 to 300 lines):
diff -r aeb833a86c3f -r 21c7f0257bd5 mk/bsd.pkg.defaults.mk
--- a/mk/bsd.pkg.defaults.mk Thu Jan 29 17:15:47 2004 +0000
+++ b/mk/bsd.pkg.defaults.mk Thu Jan 29 18:36:38 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.209 2004/01/24 09:23:22 xtraeme Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.210 2004/01/29 18:36:38 jmmv Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -919,6 +919,14 @@
# Intel Etherexpress Pro/100 and SMC EtherPower II support.
# Default: not defined (-> no netboot support)
+#GRUB_PRESET_COMMAND=
+# Specifies a single command that will be embedded into GRUB's stage2 and
+# executed at boot time as a default configuration file. This is usually
+# useful to create stage2 files with automated diskless support; you should
+# set this variable to "bootp", "dhcp" or "rarp", and use it together
+# GRUB_NETWORK_CARDS.
+# Default: not defined
+
#GRUB_SCAN_ARGS=
# Can be used to supply additional configure arguments for netboot support in
# GRUB. Set e.g. "GRUB_NETWORK_CARDS" to "ne" and "GRUB_SCAN_ARGS" to
diff -r aeb833a86c3f -r 21c7f0257bd5 sysutils/grub/Makefile
--- a/sysutils/grub/Makefile Thu Jan 29 17:15:47 2004 +0000
+++ b/sysutils/grub/Makefile Thu Jan 29 18:36:38 2004 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2004/01/24 16:36:03 mrauch Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/29 18:36:38 jmmv Exp $
#
-DISTNAME= grub-0.93
-PKGREVISION= 3
+DISTNAME= grub-0.94
CATEGORIES= sysutils
MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
-MAINTAINER= tron%NetBSD.org@localhost
+MAINTAINER= jmmv%NetBSD.org@localhost
HOMEPAGE= http://www.gnu.org/software/grub/
COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2
@@ -14,14 +13,19 @@
GNU_CONFIGURE= YES
USE_GNU_TOOLS+= make
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
INFO_FILES= grub.info
+BUILDLINK_TRANSFORM+= S:-fno-builtin:-ffreestanding:
+
.include "../../mk/bsd.prefs.mk"
+BUILD_DEFS+= GRUB_NETWORK_CARDS
+BUILD_DEFS+= GRUB_PRESET_COMMAND
+BUILD_DEFS+= GRUB_SCAN_ARGS
+
.if defined(GRUB_NETWORK_CARDS)
-BUILD_DEFS+= GRUB_NETWORK_CARDS
CONFIGURE_ARGS+= --enable-diskless
PLIST_SUBST+= NETBOOT=
@@ -37,10 +41,17 @@
PLIST_SUBST+= NETBOOT="@comment "
.endif
+.if defined(GRUB_PRESET_COMMAND) && !empty(GRUB_PRESET_COMMAND)
+CONFIGURE_ARGS+= --enable-preset-menu=${WRKSRC}/presetmenu
+
+post-extract:
+ ${ECHO} ${GRUB_PRESET_COMMAND} > ${WRKSRC}/presetmenu
+.endif
+
.if defined(GRUB_SCAN_ARGS)
CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
.endif
-.include "../../devel/binutils/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/binutils/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r aeb833a86c3f -r 21c7f0257bd5 sysutils/grub/distinfo
--- a/sysutils/grub/distinfo Thu Jan 29 17:15:47 2004 +0000
+++ b/sysutils/grub/distinfo Thu Jan 29 18:36:38 2004 +0000
@@ -1,18 +1,8 @@
-$NetBSD: distinfo,v 1.7 2004/01/24 16:36:03 mrauch Exp $
+$NetBSD: distinfo,v 1.8 2004/01/29 18:36:38 jmmv Exp $
-SHA1 (grub-0.93.tar.gz) = 51cc79b0088f8e0e3260e33dc5b2ea5055bfc8f8
-Size (grub-0.93.tar.gz) = 891032 bytes
+SHA1 (grub-0.94.tar.gz) = 12e0a2b7b6ee998232b057a8182ae54c33a6e0c5
+Size (grub-0.94.tar.gz) = 923518 bytes
SHA1 (patch-aa) = f2b6a1c0ec11c1c01f39bf6241291fc0c3879e34
SHA1 (patch-ab) = 274f05f518de51b708102ec853641e237fd40990
-SHA1 (patch-ac) = 891a04da17ae13ad10227d137448eb5d028759ca
-SHA1 (patch-ad) = 8a39ae6da142493672d11521fd99594a6161a1d0
-SHA1 (patch-ae) = fc41e5b3db06d3e2fa33913946e1eb31a93f435f
-SHA1 (patch-af) = 0955009cd1b09b766b3aab5517b36002c6c08401
-SHA1 (patch-ag) = ecbbcf164039cbc047b247036fa183bb8ae08a6f
-SHA1 (patch-ah) = cecaf3e1510a3fdba2d3412b59c434d5d247b11b
SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba
SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8
-SHA1 (patch-ak) = 24d59bdc00b35dee736196fcb937a4142c3392ca
-SHA1 (patch-am) = b1fd1977b97dd7aa8056eeaa5beecb624b3374d0
-SHA1 (patch-an) = 64150a001f39d32f0c867b9818fcef4a8cd649b2
-SHA1 (patch-ao) = 59532f4f268286cedf8344df1ce34f57305fd994
diff -r aeb833a86c3f -r 21c7f0257bd5 sysutils/grub/patches/patch-ac
--- a/sysutils/grub/patches/patch-ac Thu Jan 29 17:15:47 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/03/14 23:35:25 thorpej Exp $
-
---- netboot/Makefile.am.orig 2003-03-14 15:21:01.000000000 -0800
-+++ netboot/Makefile.am 2003-03-14 15:21:18.000000000 -0800
-@@ -19,7 +19,7 @@
- ni5010.c ns8390.c ns8390.h otulip.c otulip.h rtl8139.c \
- sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \
- tiara.c tlan.c tulip.c via-rhine.c w89c840.c
--libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- -DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS)
- # Filled by configure.
- libdrivers_a_LIBADD = @NETBOOT_DRIVERS@
-@@ -60,127 +60,127 @@
- # Is it really necessary to specify dependecies explicitly?
- $(3c509_drivers): 3c509.c 3c509.h
- $(3c509_drivers): %.o: 3c509.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(3c595_drivers): 3c595.c 3c595.h
- $(3c595_drivers): %.o: 3c595.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(3c90x_drivers): 3c90x.c
- $(3c90x_drivers): %.o: 3c90x.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(cs89x0_drivers): cs89x0.c cs89x0.h
- $(cs89x0_drivers): %.o: cs89x0.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(davicom_drivers): davicom.c
- $(davicom_drivers): %.o: davicom.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(depca_drivers): depca.c
- $(depca_drivers): %.o: depca.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(eepro_drivers): eepro.c
- $(eepro_drivers): %.o: eepro.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(eepro100_drivers): eepro100.c
- $(eepro100_drivers): %.o: eepro100.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(epic100_drivers): epic100.c epic100.h
- $(epic100_drivers): %.o: epic100.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- #$(fa311_drivers): fa311.c
- #$(fa311_drivers): %.o: fa311.c
--# $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+# $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- # $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(i82586_drivers): i82586.c
- $(i82586_drivers): %.o: i82586.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(lance_drivers): lance.c
- $(lance_drivers): %.o: lance.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(natsemi_drivers): natsemi.c
- $(natsemi_drivers): %.o: natsemi.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(ni5010_drivers): ni5010.c
- $(ni5010_drivers): %.o: ni5010.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(ns8390_drivers): ns8390.c ns8390.h
- $(ns8390_drivers): %.o: ns8390.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(otulip_drivers): otulip.c otulip.h
- $(otulip_drivers): %.o: otulip.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(rtl8139_drivers): rtl8139.c
- $(rtl8139_drivers): %.o: rtl8139.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(sis900_drivers): sis900.c
- $(sis900_drivers): %.o: sis900.c sis900.h
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(sk_g16_drivers): sk_g16.c sk_g16.h
- $(sk_g16_drivers): %.o: sk_g16.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(smc9000_drivers): smc9000.c smc9000.h
- $(smc9000_drivers): %.o: smc9000.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(tiara_drivers): tiara.c
- $(tiara_drivers): %.o: tiara.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- #$(tlan_drivers): tlan.c
- #$(tlan_drivers): %.o: tlan.c
--# $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+# $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- # $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(tulip_drivers): tulip.c
- $(tulip_drivers): %.o: tulip.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(via_rhine_drivers): via-rhine.c
- $(via_rhine_drivers): %.o: via-rhine.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(w89c840_drivers): w89c840.c
- $(w89c840_drivers): %.o: w89c840.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- # Per-object flags.
diff -r aeb833a86c3f -r 21c7f0257bd5 sysutils/grub/patches/patch-ad
--- a/sysutils/grub/patches/patch-ad Thu Jan 29 17:15:47 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,166 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/03/14 23:35:25 thorpej Exp $
-
---- netboot/Makefile.in.orig 2003-03-14 15:21:22.000000000 -0800
-+++ netboot/Makefile.in 2003-03-14 15:21:31.000000000 -0800
-@@ -107,7 +107,7 @@
- sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \
- tiara.c tlan.c tulip.c via-rhine.c w89c840.c
-
--libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- -DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS)
-
- # Filled by configure.
-@@ -852,127 +852,127 @@
- # Is it really necessary to specify dependecies explicitly?
- $(3c509_drivers): 3c509.c 3c509.h
Home |
Main Index |
Thread Index |
Old Index