Date: Fri, 5 Jun 2009 12:00: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: r193494 - in stable/7/sys/boot: . i386 i386/loader Message-ID: <200906051200.n55C0tRj024830@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Fri Jun 5 12:00:55 2009 New Revision: 193494 URL: http://svn.freebsd.org/changeset/base/193494 Log: roll zfs loader support under MK_ZFS to enable / disable consistently Modified: stable/7/sys/boot/Makefile stable/7/sys/boot/i386/Makefile stable/7/sys/boot/i386/loader/Makefile Modified: stable/7/sys/boot/Makefile ============================================================================== --- stable/7/sys/boot/Makefile Fri Jun 5 11:55:32 2009 (r193493) +++ stable/7/sys/boot/Makefile Fri Jun 5 12:00:55 2009 (r193494) @@ -17,7 +17,7 @@ SUBDIR+= efi SUBDIR+= ofw .endif -.if defined(LOADER_ZFS_SUPPORT) +.if ${MK_ZFS} != "no" SUBDIR+= zfs .endif Modified: stable/7/sys/boot/i386/Makefile ============================================================================== --- stable/7/sys/boot/i386/Makefile Fri Jun 5 11:55:32 2009 (r193493) +++ stable/7/sys/boot/i386/Makefile Fri Jun 5 12:00:55 2009 (r193494) @@ -3,7 +3,7 @@ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ kgzldr libi386 libfirewire loader -.if defined(LOADER_ZFS_SUPPORT) +.if ${MK_ZFS} != "no" SUBDIR+= zfsboot gptzfsboot .endif Modified: stable/7/sys/boot/i386/loader/Makefile ============================================================================== --- stable/7/sys/boot/i386/loader/Makefile Fri Jun 5 11:55:32 2009 (r193493) +++ stable/7/sys/boot/i386/loader/Makefile Fri Jun 5 12:00:55 2009 (r193494) @@ -15,8 +15,7 @@ CFLAGS+= -DLOADER_FIREWIRE_SUPPORT LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a .endif -# Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support -.if defined(LOADER_ZFS_SUPPORT) +.if ${MK_ZFS} != "no" CFLAGS+= -DLOADER_ZFS_SUPPORT LIBZFS= ${.OBJDIR}/../../zfs/libzfsboot.a .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906051200.n55C0tRj024830>