From 43e0273d27b63b1833bb822d643f45e4c3333507 Mon Sep 17 00:00:00 2001 From: jmmv Date: Thu, 29 Jan 2004 18:36:38 +0000 Subject: 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@. --- 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 ---- 12 files changed, 22 insertions(+), 478 deletions(-) delete mode 100644 sysutils/grub/patches/patch-ac delete mode 100644 sysutils/grub/patches/patch-ad delete mode 100644 sysutils/grub/patches/patch-ae delete mode 100644 sysutils/grub/patches/patch-af delete mode 100644 sysutils/grub/patches/patch-ag delete mode 100644 sysutils/grub/patches/patch-ah delete mode 100644 sysutils/grub/patches/patch-ak delete mode 100644 sysutils/grub/patches/patch-am delete mode 100644 sysutils/grub/patches/patch-an delete mode 100644 sysutils/grub/patches/patch-ao (limited to 'sysutils/grub') diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 58bc610db89..7f592afb3b3 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -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 +MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnu.org/software/grub/ COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2 @@ -14,14 +13,19 @@ ONLY_FOR_PLATFORM= *-*-i386 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" -.if defined(GRUB_NETWORK_CARDS) BUILD_DEFS+= GRUB_NETWORK_CARDS +BUILD_DEFS+= GRUB_PRESET_COMMAND +BUILD_DEFS+= GRUB_SCAN_ARGS + +.if defined(GRUB_NETWORK_CARDS) CONFIGURE_ARGS+= --enable-diskless PLIST_SUBST+= NETBOOT= @@ -37,10 +41,17 @@ post-install: 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 --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo index ebe9340a766..cd9026a903f 100644 --- a/sysutils/grub/distinfo +++ b/sysutils/grub/distinfo @@ -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 --git a/sysutils/grub/patches/patch-ac b/sysutils/grub/patches/patch-ac deleted file mode 100644 index 7d1c3a1f368..00000000000 --- a/sysutils/grub/patches/patch-ac +++ /dev/null @@ -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 --git a/sysutils/grub/patches/patch-ad b/sysutils/grub/patches/patch-ad deleted file mode 100644 index f6f5d82502d..00000000000 --- a/sysutils/grub/patches/patch-ad +++ /dev/null @@ -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 - $(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 $< - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/sysutils/grub/patches/patch-ae b/sysutils/grub/patches/patch-ae deleted file mode 100644 index f6fcf13fc96..00000000000 --- a/sysutils/grub/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2003/03/14 23:35:26 thorpej Exp $ - ---- stage1/Makefile.am.orig 2003-03-14 15:23:00.000000000 -0800 -+++ stage1/Makefile.am 2003-03-14 15:23:10.000000000 -0800 -@@ -4,7 +4,7 @@ - CLEANFILES = $(nodist_pkgdata_DATA) - - # We can't use builtins or standard includes. --AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc -+AM_ASFLAGS = $(STAGE1_CFLAGS) -ffreestanding -nostdinc - LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00 - - noinst_PROGRAMS = stage1.exec diff --git a/sysutils/grub/patches/patch-af b/sysutils/grub/patches/patch-af deleted file mode 100644 index ce60c9aee81..00000000000 --- a/sysutils/grub/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2003/03/14 23:35:26 thorpej Exp $ - ---- stage1/Makefile.in.orig 2003-03-14 15:23:32.000000000 -0800 -+++ stage1/Makefile.in 2003-03-14 15:23:47.000000000 -0800 -@@ -91,7 +91,7 @@ - CLEANFILES = $(nodist_pkgdata_DATA) - - # We can't use builtins or standard includes. --AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc -+AM_ASFLAGS = $(STAGE1_CFLAGS) -ffreestanding -nostdinc - LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00 - - noinst_PROGRAMS = stage1.exec diff --git a/sysutils/grub/patches/patch-ag b/sysutils/grub/patches/patch-ag deleted file mode 100644 index 25e2f46553d..00000000000 --- a/sysutils/grub/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2003/03/14 23:35:26 thorpej Exp $ - ---- stage2/Makefile.am.orig 2003-03-14 15:24:38.000000000 -0800 -+++ stage2/Makefile.am 2003-03-14 15:24:48.000000000 -0800 -@@ -75,7 +75,7 @@ - HERCULES_FLAGS = - endif - --STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ -+STAGE2_COMPILE = $(STAGE2_CFLAGS) -ffreestanding -nostdinc \ - $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) - - STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000 diff --git a/sysutils/grub/patches/patch-ah b/sysutils/grub/patches/patch-ah deleted file mode 100644 index fb4024563cd..00000000000 --- a/sysutils/grub/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2003/07/13 17:35:05 wiz Exp $ - ---- stage2/Makefile.in.orig Fri Nov 29 21:28:45 2002 -+++ stage2/Makefile.in -@@ -158,7 +158,7 @@ PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-T - @HERCULES_SUPPORT_TRUE@HERCULES_FLAGS = -DSUPPORT_HERCULES=1 - @HERCULES_SUPPORT_FALSE@HERCULES_FLAGS = - --STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \ -+STAGE2_COMPILE = $(STAGE2_CFLAGS) -ffreestanding -nostdinc \ - $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) - - diff --git a/sysutils/grub/patches/patch-ak b/sysutils/grub/patches/patch-ak deleted file mode 100644 index d664625008f..00000000000 --- a/sysutils/grub/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2003/10/26 12:28:50 mrauch Exp $ - ---- stage2/fsys_reiserfs.c.orig 2002-11-29 18:46:01.000000000 +0100 -+++ stage2/fsys_reiserfs.c -@@ -112,7 +112,7 @@ struct reiserfs_journal_header { - /* offset in the log of where to start replay after a crash */ - __u32 j_first_unflushed_offset; - /* mount id to detect very old transactions */ -- __u32 long j_mount_id; -+ __u32 j_mount_id; - }; - - /* magic string to find desc blocks in the journal */ diff --git a/sysutils/grub/patches/patch-am b/sysutils/grub/patches/patch-am deleted file mode 100644 index cbe25820330..00000000000 --- a/sysutils/grub/patches/patch-am +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-am,v 1.1 2004/01/24 16:36:03 mrauch Exp $ - ---- stage2/builtins.c.orig 2002-12-04 05:41:57.000000000 +0100 -+++ stage2/builtins.c -@@ -4202,12 +4202,12 @@ terminfo_func (char *arg, int flags) - return errnum; - } - -- ti_set_term (term); -+ ti_set_term (&term); - } - else - { - /* No option specifies printing out current settings. */ -- term = ti_get_term (); -+ ti_get_term (&term); - - grub_printf ("name=%s\n", term.name); - grub_printf ("cursor_address=%s\n", term.cursor_address); diff --git a/sysutils/grub/patches/patch-an b/sysutils/grub/patches/patch-an deleted file mode 100644 index 3194e5ff58f..00000000000 --- a/sysutils/grub/patches/patch-an +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-an,v 1.1 2004/01/24 16:36:03 mrauch Exp $ - ---- stage2/terminfo.c.orig 2002-11-29 20:07:38.000000000 +0100 -+++ stage2/terminfo.c -@@ -245,15 +245,15 @@ ti_exit_standout_mode (void) - - /* set the current terminal emulation to use */ - void --ti_set_term (struct terminfo new) -+ti_set_term (const struct terminfo *new) - { -- term = new; -+ grub_memmove (&term, new, sizeof (struct terminfo)); - } - --/* return the current terminal emulation */ --struct terminfo --ti_get_term(void) -+/* get the current terminal emulation */ -+void -+ti_get_term(struct terminfo *copy) - { -- return term; -+ grub_memmove (copy, &term, sizeof (struct terminfo)); - } - diff --git a/sysutils/grub/patches/patch-ao b/sysutils/grub/patches/patch-ao deleted file mode 100644 index d68ee278905..00000000000 --- a/sysutils/grub/patches/patch-ao +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2004/01/24 16:36:03 mrauch Exp $ - ---- stage2/terminfo.h.orig 2002-11-29 20:07:14.000000000 +0100 -+++ stage2/terminfo.h -@@ -40,8 +40,8 @@ char *ti_escape_string (const char *in); - char *ti_unescape_memory (const char *in, const char *end); - char *ti_unescape_string (const char *in); - --void ti_set_term (struct terminfo term); --struct terminfo ti_get_term (void); -+void ti_set_term (const struct terminfo *new); -+void ti_get_term (struct terminfo *copy); - - void ti_cursor_address (int x, int y); - void ti_clear_screen (void); -- cgit v1.2.3