From 971119a1d717baefb5f30abdcdd6ac5b507b5544 Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 20 Jul 2002 12:42:35 +0000 Subject: Add optional netboot support to "grub" package as suggested by Julio Merino in PR pkg/17354. --- mk/bsd.pkg.defaults.mk | 15 ++++++++++++++- sysutils/grub/Makefile | 23 ++++++++++++++++++++--- sysutils/grub/PLIST | 4 +++- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk index 74b7ac897b2..984dcc074b9 100644 --- a/mk/bsd.pkg.defaults.mk +++ b/mk/bsd.pkg.defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.defaults.mk,v 1.70 2002/07/15 16:24:01 schmonz Exp $ +# $NetBSD: bsd.pkg.defaults.mk,v 1.71 2002/07/20 12:42:35 tron Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -565,6 +565,19 @@ GAWK_ENABLE_PORTALS?= NO # Possible: yes, no, not defined # Default: not defined (-> Russian support enabled) +#GRUB_NETWORK_CARDS= +# Compile netboot support for the listed network interface cards into GRUB. +# Use e.g. "rtl8139" for RealTek 8139 support or "eepro100 epic100" for +# Intel Etherexpress Pro/100 and SMC EtherPower II support. +# Default: not defined (-> no netboot support) + +#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 +# "--enable-ne-scan=0x300" to let the boot loader search for an NE 2000 ISA +# card at I/O offset 0x300. +# Default: not defined + IMAP_UW_CCLIENT_MBOX_FMT?= unix # Used in imap-uw to set the default format used by c-client programs for # new mailbox creation. Check the UW IMAP documentation for more details diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index a248053722a..43d01538752 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2002/06/08 18:28:06 cjep Exp $ -# +# $NetBSD: Makefile,v 1.8 2002/07/20 12:42:36 tron Exp $ DISTNAME= grub-0.92 CATEGORIES= sysutils MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ -MAINTAINER= jgoerzen@complete.org +MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gnu.org/software/grub/ COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2 @@ -15,6 +14,24 @@ GNU_CONFIGURE= YES USE_GMAKE= YES USE_BUILDLINK_ONLY= YES +.include "../../mk/bsd.prefs.mk" + +.if defined(GRUB_NETWORK_CARDS) +BUILD_DEFS+= GRUB_NETWORK_CARDS +CONFIGURE_ARGS+= --enable-diskless +PLIST_SUBST+= NETBOOT= + +.for GRUB_NETWORK_CARD in ${GRUB_NETWORK_CARDS} +CONFIGURE_ARGS+= --enable-${GRUB_NETWORK_CARD} +.endfor +.else +PLIST_SUBST+= NETBOOT="@comment " +.endif + +.if defined(GRUB_SCAN_ARGS) +CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS} +.endif + .include "../../devel/binutils/buildlink.mk" .include "../../devel/ncurses/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST index 9fe13ba3c5a..c016e2f2393 100644 --- a/sysutils/grub/PLIST +++ b/sysutils/grub/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/04/11 19:53:25 magick Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/07/20 12:42:36 tron Exp $ bin/mbchk @unexec install-info --delete --info-dir=%D/info %D/info/grub.info info/grub.info @@ -19,6 +19,8 @@ share/grub/${MACHINE_ARCH}-/fat_stage1_5 share/grub/${MACHINE_ARCH}-/ffs_stage1_5 share/grub/${MACHINE_ARCH}-/jfs_stage1_5 share/grub/${MACHINE_ARCH}-/minix_stage1_5 +${NETBOOT}share/grub/${MACHINE_ARCH}-/nbgrub +${NETBOOT}share/grub/${MACHINE_ARCH}-/pxegrub share/grub/${MACHINE_ARCH}-/reiserfs_stage1_5 share/grub/${MACHINE_ARCH}-/stage1 share/grub/${MACHINE_ARCH}-/stage2 -- cgit v1.2.3