diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-10-16 11:59:37 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-10-16 11:59:37 +0000 |
| commit | 4893b66699503c6556e64ed2925ff0e76b19f01f (patch) | |
| tree | dff825c01135fbc50d4e51783737254af4faf9ea /usr | |
| parent | 839f5c3a41e3409232c9a97dabfe5e86960709f3 (diff) | |
| parent | 495a25e757699e05ac57407a3f80f6ee235eee2d (diff) | |
| download | illumos-joyent-4893b66699503c6556e64ed2925ff0e76b19f01f.tar.gz | |
[illumos-gate merge]
commit 495a25e757699e05ac57407a3f80f6ee235eee2d
6326 Eliminate unused filesystems from GRUB's stage 2 to bring back free memory
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/grub/capability | 2 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/Makefile.solaris | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/usr/src/grub/capability b/usr/src/grub/capability index 72f4bf9b83..884d019d8c 100644 --- a/usr/src/grub/capability +++ b/usr/src/grub/capability @@ -30,7 +30,7 @@ # GRUB necessitating that the boot blocks be reinstalled for that fix or # enhancement to take effect. # -VERSION=26 +VERSION=27 dboot xVM zfs diff --git a/usr/src/grub/grub-0.97/stage2/Makefile.solaris b/usr/src/grub/grub-0.97/stage2/Makefile.solaris index bb737888cd..a9440da2b8 100644 --- a/usr/src/grub/grub-0.97/stage2/Makefile.solaris +++ b/usr/src/grub/grub-0.97/stage2/Makefile.solaris @@ -2,6 +2,7 @@ # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # Copyright (c) 2013 by Saso Kiselkov. All rights reserved. +# Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved. # include ../../Makefile.grub include ../Makefile.solaris.defs @@ -16,25 +17,23 @@ include ../Makefile.solaris.defs INCLUDES = -I. -I.. -I../stage1 -I../netboot LIBS = -FSYS_CFLAGS = -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 -DFSYS_UFS=1 \ - -DFSYS_ZFS=1 \ - -DFSYS_UFS2=1 -DFSYS_REISERFS=1 -DFSYS_ISO9660=1 \ +FSYS_CFLAGS = -DFSYS_UFS=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 \ + -DFSYS_ZFS=1 -DFSYS_UFS2=1 -DFSYS_ISO9660=1 \ -DUSE_MD5_PASSWORDS=1 $(STAGE2_NETBOOT)TFTP_CFLAGS = -DFSYS_TFTP=1 $(OPTION_FS)FSYS_CFLAGS += -DFSYS_MINIX=1 -DFSYS_JFS=1 -DFSYS_XFS=1 \ - -DSYS_VSTAFS=1 + -DSYS_VSTAFS=1 -DFSYS_FFS=1 -DFSYS_REISERFS=1 GRAPHICS_CFLAGS = -DSUPPORT_GRAPHICS=1 # HERCULES_CFLAGS = -DSUPPORT_HERCULES=1 NETBOOT_CFLAGS = -DSUPPORT_NETBOOT=1 SERIAL_CFLAGS = -DSUPPORT_SERIAL=1 GRUB_CFLAGS = -O2 -I../lib -DGRUB_UTIL=1 \ - -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 -DFSYS_ISO9660=1 \ - -DFSYS_ZFS=1 \ - -DFSYS_REISERFS=1 -DFSYS_UFS=1 -DFSYS_UFS2=1 \ + -DFSYS_ISO9660=1 -DFSYS_ZFS=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 \ + -DFSYS_UFS=1 -DFSYS_UFS2=1 \ -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 $(OPTION_FS)GRUB_CFLAGS += -DFSYS_MINIX=1 -DFSYS_JFS=1 -DFSYS_XFS=1 \ - -DSYS_VSTAFS=1 + -DSYS_VSTAFS=1 -DFSYS_FFS=1 -DFSYS_REISERFS=1 # GRUB_CFLAGS += -DSUPPORT_HERCULES=1 STAGE1_5_CFLAGS = $(STAGE2_CFLAGS) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1 STAGE2_CFLAGS = -Os -fno-builtin -nostdinc \ |