Date: Sat, 13 Jun 2009 22:02:55 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r194131 - stable/7/sys/boot/i386/loader Message-ID: <200906132202.n5DM2tQi025447@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sat Jun 13 22:02:55 2009 New Revision: 194131 URL: http://svn.freebsd.org/changeset/base/194131 Log: comment out zfs support until I have time for a proper fix Modified: stable/7/sys/boot/i386/loader/Makefile Modified: stable/7/sys/boot/i386/loader/Makefile ============================================================================== --- stable/7/sys/boot/i386/loader/Makefile Sat Jun 13 21:55:08 2009 (r194130) +++ stable/7/sys/boot/i386/loader/Makefile Sat Jun 13 22:02:55 2009 (r194131) @@ -16,12 +16,12 @@ LIBFIREWIRE= ${.OBJDIR}/../libfirewire/l .endif # Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support -.if ${MK_ZFS} != "no" -CFLAGS+= -DLOADER_ZFS_SUPPORT -LIBZFS= ${.OBJDIR}/../../zfs/libzfsboot.a -.else +#.if ${MK_ZFS} != "no" +#CFLAGS+= -DLOADER_ZFS_SUPPORT +#LIBZFS= ${.OBJDIR}/../../zfs/libzfsboot.a +#.else LIBZFS= -.endif +#.endif # Enable PXE TFTP or NFS support, not both. .if defined(LOADER_TFTP_SUPPORT)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906132202.n5DM2tQi025447>