Date: Tue, 23 Mar 2010 21:39:33 +0000 (UTC) From: John Baldwin <jhb@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: r205539 - stable/7/sys/boot/i386/loader Message-ID: <201003232139.o2NLdXQQ094867@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhb Date: Tue Mar 23 21:39:33 2010 New Revision: 205539 URL: http://svn.freebsd.org/changeset/base/205539 Log: Enable the ability to build ZFS into the loader so that /boot/zfsloader actually contains ZFS support. Submitted by: Alexander Zagrebin alexz of visp ru Modified: stable/7/sys/boot/i386/loader/Makefile Modified: stable/7/sys/boot/i386/loader/Makefile ============================================================================== --- stable/7/sys/boot/i386/loader/Makefile Tue Mar 23 21:38:41 2010 (r205538) +++ stable/7/sys/boot/i386/loader/Makefile Tue Mar 23 21:39:33 2010 (r205539) @@ -17,12 +17,12 @@ LIBFIREWIRE= ${.OBJDIR}/../libfirewire/l .endif # Set by zfsloader Makefile -#.if ${MK_ZFS} != "no" -#CFLAGS+= -DLOADER_ZFS_SUPPORT -#LIBZFS= ${.OBJDIR}/../../zfs/libzfsboot.a -#.else +.if defined(LOADER_ZFS_SUPPORT) +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?201003232139.o2NLdXQQ094867>