Date: Fri, 5 Jun 2009 12:14:43 +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: r193495 - in stable/7/sys/boot: . i386 i386/loader Message-ID: <200906051214.n55CEhgJ025118@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Fri Jun 5 12:14:43 2009 New Revision: 193495 URL: http://svn.freebsd.org/changeset/base/193495 Log: reverse previous commit ... 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 12:00:55 2009 (r193494) +++ stable/7/sys/boot/Makefile Fri Jun 5 12:14:43 2009 (r193495) @@ -17,7 +17,7 @@ SUBDIR+= efi SUBDIR+= ofw .endif -.if ${MK_ZFS} != "no" +.if defined(LOADER_ZFS_SUPPORT) SUBDIR+= zfs .endif Modified: stable/7/sys/boot/i386/Makefile ============================================================================== --- stable/7/sys/boot/i386/Makefile Fri Jun 5 12:00:55 2009 (r193494) +++ stable/7/sys/boot/i386/Makefile Fri Jun 5 12:14:43 2009 (r193495) @@ -3,7 +3,7 @@ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \ kgzldr libi386 libfirewire loader -.if ${MK_ZFS} != "no" +.if defined(LOADER_ZFS_SUPPORT) SUBDIR+= zfsboot gptzfsboot .endif Modified: stable/7/sys/boot/i386/loader/Makefile ============================================================================== --- stable/7/sys/boot/i386/loader/Makefile Fri Jun 5 12:00:55 2009 (r193494) +++ stable/7/sys/boot/i386/loader/Makefile Fri Jun 5 12:14:43 2009 (r193495) @@ -15,7 +15,8 @@ CFLAGS+= -DLOADER_FIREWIRE_SUPPORT LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a .endif -.if ${MK_ZFS} != "no" +# Put LOADER_ZFS_SUPPORT=yes in /etc/make.conf for ZFS support +.if defined(LOADER_ZFS_SUPPORT) 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?200906051214.n55CEhgJ025118>