Update sysutils/grub to 0.95, and remove obsoleted options
GRUB_USE_UFS2/GRUB_USE_ISO9660, they are not longer needed. New in 0.95 - 2004-06-13: * Add support for ReiserFS 3. * Fix support for FreeBSD 5. * Support ATARAID for Linux in the grub shell and grub-install. * Add CDROM support for El Torito with no emulation mode. You can use (cd) as a CDROM drive in the config file. * Option --no-mem-option is implied for Linux 2.4.18 and newer. * Add support for UFS2.
This commit is contained in:
parent
fa4888b7a4
commit
360c467eeb
5 changed files with 12 additions and 64 deletions
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: CHANGES,v 1.6247 2004/06/20 20:44:36 agc Exp $
|
||||
$NetBSD: CHANGES,v 1.6248 2004/06/20 20:57:17 xtraeme Exp $
|
||||
|
||||
Changes to the packages collection and infrastructure in 2004:
|
||||
|
||||
|
@ -2980,3 +2980,4 @@ Changes to the packages collection and infrastructure in 2004:
|
|||
Added gst-plugins-artsd-0.8.1 [agc 2004-06-20]
|
||||
Updated libbonobo to 2.6.2 [jmmv 2004-06-20]
|
||||
Added tunesbrowser-0.1.5 [agc 2004-06-20]
|
||||
Updated grub to 0.95 [xtraeme 2004-06-20]
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.pkg.defaults.mk,v 1.251 2004/06/20 02:52:56 xtraeme Exp $
|
||||
# $NetBSD: bsd.pkg.defaults.mk,v 1.252 2004/06/20 20:57:17 xtraeme Exp $
|
||||
#
|
||||
|
||||
# A file providing defaults for pkgsrc and the packages collection.
|
||||
|
@ -1000,16 +1000,6 @@ GOLEM_WITH_SOUND?= NO
|
|||
# card at I/O offset 0x300.
|
||||
# Default: not defined
|
||||
|
||||
GRUB_USE_ISO9660?= NO
|
||||
# This option will add support for the ISO9660 filesystem to GRUB.
|
||||
# Possible: yes or no.
|
||||
# Default: no.
|
||||
|
||||
GRUB_USE_UFS2?= NO
|
||||
# This option will add support for the UFS2 filesystem to GRUB.
|
||||
# Possible: yes or no.
|
||||
# Default: no.
|
||||
|
||||
ICECAST_CHROOTDIR?= ${VARBASE}/chroot/icecast
|
||||
# Used in icecast2 to specify the chroot directory in which icecast
|
||||
# will be allowed to work.
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.25 2004/05/02 20:04:36 xtraeme Exp $
|
||||
# $NetBSD: Makefile,v 1.26 2004/06/20 20:57:17 xtraeme Exp $
|
||||
#
|
||||
|
||||
DISTNAME= grub-0.94
|
||||
PKGREVISION= 1
|
||||
DISTNAME= grub-0.95
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
|
||||
|
||||
|
@ -25,8 +24,6 @@ BUILDLINK_TRANSFORM+= S:-fno-builtin:-ffreestanding:
|
|||
BUILD_DEFS+= GRUB_NETWORK_CARDS
|
||||
BUILD_DEFS+= GRUB_PRESET_COMMAND
|
||||
BUILD_DEFS+= GRUB_SCAN_ARGS
|
||||
BUILD_DEFS+= GRUB_USE_ISO9660
|
||||
BUILD_DEFS+= GRUB_USE_UFS2
|
||||
|
||||
.if defined(GRUB_NETWORK_CARDS)
|
||||
CONFIGURE_ARGS+= --enable-diskless
|
||||
|
@ -55,42 +52,6 @@ post-extract:
|
|||
CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
|
||||
.endif
|
||||
|
||||
.if !empty(GRUB_USE_ISO9660:M[Yy][Ee][Ss])
|
||||
CONFIGURE_ARGS+= --enable-iso9660
|
||||
PATCHFILES+= grub-0.94-iso9660.diff
|
||||
SITES_grub-0.94-iso9660.diff=ftp://ftp.netbsd.org/pub/NetBSD/misc/xtraeme/
|
||||
|
||||
PLIST_SUBST+= ISO9660=
|
||||
.else
|
||||
PLIST_SUBST+= ISO9660="@comment "
|
||||
.endif
|
||||
|
||||
.if !empty(GRUB_USE_UFS2:M[Yy][Ee][Ss])
|
||||
CONFIGURE_ARGS+= --enable-ufs2
|
||||
PATCHFILES+= patch-ufs2
|
||||
SITES_patch-ufs2=http://sources.freebsd.org/HEAD/ports/sysutils/grub/files/
|
||||
|
||||
PLIST_SUBST+= UFS2=
|
||||
.else
|
||||
PLIST_SUBST+= UFS2="@comment "
|
||||
.endif
|
||||
|
||||
.if (!empty(GRUB_USE_ISO9660:M[Yy][Ee][Ss]) || \
|
||||
!empty(GRUB_USE_UFS2:M[Yy][Ee][Ss]))
|
||||
pre-configure:
|
||||
cd ${WRKSRC}; \
|
||||
${ACLOCAL}; \
|
||||
${AUTOHEADER}; \
|
||||
${AUTOMAKE} -a --foreign -i; \
|
||||
${AUTOCONF}
|
||||
.include "../../mk/automake.mk"
|
||||
.endif
|
||||
|
||||
.if (!empty(GRUB_USE_ISO9660:M[Yy][Ee][Ss]) && \
|
||||
!empty(GRUB_USE_UFS2:M[Yy][Ee][Ss]))
|
||||
PKG_FAIL_REASON+= "Please use GRUB_USE_ISO9660 or GRUB_USE_UFS2, but not both."
|
||||
.endif
|
||||
|
||||
.include "../../devel/binutils/buildlink3.mk"
|
||||
.include "../../devel/ncurses/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.9 2004/05/02 17:00:14 xtraeme Exp $
|
||||
@comment $NetBSD: PLIST,v 1.10 2004/06/20 20:57:17 xtraeme Exp $
|
||||
bin/mbchk
|
||||
man/man1/mbchk.1
|
||||
man/man8/grub-install.8
|
||||
|
@ -13,7 +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}-/iso9660_stage1_5
|
||||
share/grub/${MACHINE_ARCH}-/jfs_stage1_5
|
||||
share/grub/${MACHINE_ARCH}-/minix_stage1_5
|
||||
${NETBOOT}share/grub/${MACHINE_ARCH}-/nbgrub
|
||||
|
@ -21,8 +21,8 @@ ${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
|
||||
${UFS2}share/grub/${MACHINE_ARCH}-/ufs2_stage1_5
|
||||
share/grub/${MACHINE_ARCH}-/stage2_eltorito
|
||||
share/grub/${MACHINE_ARCH}-/ufs2_stage1_5
|
||||
share/grub/${MACHINE_ARCH}-/vstafs_stage1_5
|
||||
share/grub/${MACHINE_ARCH}-/xfs_stage1_5
|
||||
@dirrm share/grub/${MACHINE_ARCH}-
|
||||
|
|
|
@ -1,11 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.10 2004/05/02 17:00:14 xtraeme Exp $
|
||||
$NetBSD: distinfo,v 1.11 2004/06/20 20:57:17 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-ufs2) = bc54fff740e3b6ff3d177903c0ca61d8654752da
|
||||
Size (patch-ufs2) = 256937 bytes
|
||||
SHA1 (grub-0.95.tar.gz) = 826d13f21f9a8574d2850d9434f8580f5830c717
|
||||
Size (grub-0.95.tar.gz) = 976017 bytes
|
||||
SHA1 (patch-aa) = f2b6a1c0ec11c1c01f39bf6241291fc0c3879e34
|
||||
SHA1 (patch-ab) = 274f05f518de51b708102ec853641e237fd40990
|
||||
SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba
|
||||
|
|
Loading…
Reference in a new issue