Date: Sat, 22 Nov 2008 01:24:06 GMT From: Garrett Cooper <gcooper@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: i386/129059: ZFS bootloader whitelistable via WITHOUT_CDDL Message-ID: <200811220124.mAM1O61Q056402@www.freebsd.org> Resent-Message-ID: <200811220130.mAM1U2Lc093359@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129059
>Category: i386
>Synopsis: ZFS bootloader whitelistable via WITHOUT_CDDL
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-i386
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 22 01:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Garrett Cooper
>Release: 8-CURRENT
>Organization:
n/a
>Environment:
FreeBSD optimus.gateway.2wire.net 8.0-CURRENT FreeBSD 8.0-CURRENT #4: Sat Sep 27 20:53:09 PDT 2008 gcooper@optimus.gateway.2wire.net:/usr/obj/usr/src/sys/OPTIMUS amd64
>Description:
I don't compile ZFS on my system and I ran into a missing dependency issue because it didn't compile ZFS. This patchset fixes that.
Please forward bug to pjd@.
>How-To-Repeat:
make buildworld WITHOUT_CDDL=yes
>Fix:
See attached patch.
Patch attached with submission follows:
Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk (revision 185157)
+++ share/mk/bsd.own.mk (working copy)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.78 2008/09/21 22:02:26 sam Exp $
#
# The include file <bsd.own.mk> set common variables for owner,
# group, mode, and directories. Defaults are in brackets.
@@ -338,6 +338,7 @@
LIB32 \
LIBPTHREAD \
LIBTHR \
+ LOADER_ZFS_SUPPORT \
LOCALES \
LOCATE \
LPR \
@@ -450,6 +451,10 @@
MK_ZFS:= no
.endif
+.if ${MK_ZFS} == "no"
+MK_LOADER_ZFS_SUPPORT:= no
+.endif
+
.if ${MK_CRYPT} == "no"
MK_OPENSSL:= no
MK_OPENSSH:= no
Index: sys/boot/i386/Makefile
===================================================================
--- sys/boot/i386/Makefile (revision 185157)
+++ sys/boot/i386/Makefile (working copy)
@@ -1,8 +1,13 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/i386/Makefile,v 1.24 2008/11/19 16:39:01 dfr Exp $
-SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
- kgzldr libi386 libfirewire loader
+.include <bsd.own.mk>
+SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot
+.if ${MK_LOADER_ZFS_SUPPORT} != "no"
+SUBDIR+= zfsboot gptzfsboot kgzldr
+.endif
+SUBDIR+= libi386 libfirewire loader
+
# special boot programs, 'self-extracting boot2+loader'
SUBDIR+= pxeldr
Index: sys/boot/Makefile
===================================================================
--- sys/boot/Makefile (revision 185157)
+++ sys/boot/Makefile (working copy)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/Makefile,v 1.37 2008/11/17 20:49:29 pjd Exp $
.include <bsd.own.mk>
@@ -26,7 +26,7 @@
SUBDIR+= uboot
.endif
-.if defined(LOADER_ZFS_SUPPORT)
+.if ${MK_LOADER_ZFS_SUPPORT} != "no"
SUBDIR+= zfs
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811220124.mAM1O61Q056402>