summaryrefslogtreecommitdiff
path: root/sysutils/grub
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-04-26 15:42:44 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-04-26 15:42:44 +0000
commit083802d3f5ea31952a8244da80b53031b8d88115 (patch)
tree244542bbb899c34247095523ea8a0afabef0f1eb /sysutils/grub
parentcd67b5acf853f7c870a013dacad62b238fb9f64f (diff)
downloadpkgsrc-083802d3f5ea31952a8244da80b53031b8d88115.tar.gz
Apply an optional patch for eltorito support, so you can boot grub
via a cdrom. It can be enabled with the option "GRUB_ISO9660" and is disabled by default.
Diffstat (limited to 'sysutils/grub')
-rw-r--r--sysutils/grub/Makefile22
-rw-r--r--sysutils/grub/PLIST4
-rw-r--r--sysutils/grub/distinfo4
3 files changed, 27 insertions, 3 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 7d20e243be3..2db3336c348 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/03/10 01:25:23 seb Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/26 15:42:44 xtraeme Exp $
#
DISTNAME= grub-0.94
@@ -24,6 +24,7 @@ BUILDLINK_TRANSFORM+= S:-fno-builtin:-ffreestanding:
BUILD_DEFS+= GRUB_NETWORK_CARDS
BUILD_DEFS+= GRUB_PRESET_COMMAND
BUILD_DEFS+= GRUB_SCAN_ARGS
+BUILD_DEFS+= GRUB_ISO9660
.if defined(GRUB_NETWORK_CARDS)
CONFIGURE_ARGS+= --enable-diskless
@@ -52,6 +53,25 @@ post-extract:
CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
.endif
+# eltorito support for GRUB
+.if defined(GRUB_ISO9660)
+CONFIGURE_ARGS+= --enable-iso9660
+PATCHFILES+= grub-0.94-iso9660.diff
+PATCH_SITES+= ftp://ftp.netbsd.org/pub/NetBSD/misc/xtraeme/
+
+PLIST_SUBST+= ISO9660=
+
+pre-configure:
+ cd ${WRKSRC}; \
+ ${ACLOCAL}; \
+ ${AUTOHEADER}; \
+ ${AUTOMAKE} -a --foreign -i; \
+ ${AUTOCONF}
+.include "../../mk/automake.mk"
+.else
+PLIST_SUBST+= ISO9660="@comment "
+.endif
+
.include "../../devel/binutils/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST
index 6505e97c05a..22e23815dc1 100644
--- a/sysutils/grub/PLIST
+++ b/sysutils/grub/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/10 01:25:23 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/26 15:42:44 xtraeme Exp $
bin/mbchk
man/man1/mbchk.1
man/man8/grub-install.8
@@ -13,6 +13,7 @@ ${NETBOOT}share/doc/grub/README.netboot
share/grub/${MACHINE_ARCH}-/e2fs_stage1_5
share/grub/${MACHINE_ARCH}-/fat_stage1_5
share/grub/${MACHINE_ARCH}-/ffs_stage1_5
+${ISO9660}share/grub/${MACHINE_ARCH}-/iso9660_stage1_5
share/grub/${MACHINE_ARCH}-/jfs_stage1_5
share/grub/${MACHINE_ARCH}-/minix_stage1_5
${NETBOOT}share/grub/${MACHINE_ARCH}-/nbgrub
@@ -20,6 +21,7 @@ ${NETBOOT}share/grub/${MACHINE_ARCH}-/pxegrub
share/grub/${MACHINE_ARCH}-/reiserfs_stage1_5
share/grub/${MACHINE_ARCH}-/stage1
share/grub/${MACHINE_ARCH}-/stage2
+${ISO9660}share/grub/${MACHINE_ARCH}-/stage2_eltorito
share/grub/${MACHINE_ARCH}-/vstafs_stage1_5
share/grub/${MACHINE_ARCH}-/xfs_stage1_5
@dirrm share/grub/${MACHINE_ARCH}-
diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo
index cd9026a903f..8eb43095bcb 100644
--- a/sysutils/grub/distinfo
+++ b/sysutils/grub/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.8 2004/01/29 18:36:38 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/04/26 15:42:44 xtraeme Exp $
SHA1 (grub-0.94.tar.gz) = 12e0a2b7b6ee998232b057a8182ae54c33a6e0c5
Size (grub-0.94.tar.gz) = 923518 bytes
+SHA1 (grub-0.94-iso9660.diff) = dcfb9c5701d3ace112d91f2c498263e9c6cba97a
+Size (grub-0.94-iso9660.diff) = 51623 bytes
SHA1 (patch-aa) = f2b6a1c0ec11c1c01f39bf6241291fc0c3879e34
SHA1 (patch-ab) = 274f05f518de51b708102ec853641e237fd40990
SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba