From nobody@FreeBSD.org  Sat Nov 22 01:24:06 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F1752106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Nov 2008 01:24:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id D6B3D8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Nov 2008 01:24:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id mAM1O6wP056403
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 22 Nov 2008 01:24:06 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id mAM1O61Q056402;
	Sat, 22 Nov 2008 01:24:06 GMT
	(envelope-from nobody)
Message-Id: <200811220124.mAM1O61Q056402@www.freebsd.org>
Date: Sat, 22 Nov 2008 01:24:06 GMT
From: Garrett Cooper <yaneurabeya@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: ZFS bootloader whitelistable via WITHOUT_CDDL
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         129059
>Category:       kern
>Synopsis:       [zfs] [patch] ZFS bootloader whitelistable via WITHOUT_CDDL
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-fs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 22 01:30:01 UTC 2008
>Closed-Date:    Mon Oct 18 14:29:15 UTC 2010
>Last-Modified:  Sun Feb 03 22:27:48 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-i386->pjd 
Responsible-Changed-By: remko 
Responsible-Changed-When: Sat Nov 22 13:07:29 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=129059 
Responsible-Changed-From-To: pjd->freebsd-fs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu May 28 22:24:59 UTC 2009 
Responsible-Changed-Why:  
With pjd's permission, reassing ZFS-related PRs to freebsd-fs. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=129059 

From: Alexandre Krasnov <freebsd@tern.ru>
To: bug-followup@freebsd.org, gcooper@freebsd.org
Cc:  
Subject: Re: kern/129059: [zfs] [patch] ZFS bootloader whitelistable via WITHOUT_CDDL
Date: Tue, 8 Dec 2009 13:18:37 +0300

 The same (or a similar one) exists in 7.2-STABLE
 If  I  specify  WITHOUT_ZFS=yes  (or WITHOUT_CDDL=yes) buidworld fails
 because zfs code still tries to compile for boot loader.
   
 btxld -v -E 0x2000 -f bin -b /home/dev/obj/usr/src/sys/boot/i386/zfsboot/../btx/btx/btx -l zfsboot.ldr  -o zfsboot.ld -P 1 zfsboot.bin
 btxld: zfsboot.ldr: Invalid argument
 *** Error code 2
 
 Stop in /usr/src/sys/boot/i386/zfsboot.
 *** Error code 1
 
 Stop in /usr/src/sys/boot/i386.
 
 
 
 
  --
 Alexander Krasnov.
 
 
 Tel: +7 (495) 234-9885
 Fax: +7 (499) 317-4127
 www.tern.ru
 
 
 
 
 

From: Garrett Cooper <yaneurabeya@gmail.com>
To: bug-followup@FreeBSD.org, gcooper@FreeBSD.org
Cc:  
Subject: Re: kern/129059: [zfs] [patch] ZFS bootloader whitelistable via WITHOUT_CDDL
Date: Sat, 16 Oct 2010 00:04:37 -0700

     This issue was fixed by jhb@ 2 weeks after the submission date via r200872.
 Thanks,
 -Garrett
State-Changed-From-To: open->closed 
State-Changed-By: jhb 
State-Changed-When: Mon Oct 18 14:28:43 UTC 2010 
State-Changed-Why:  
Fix merged to 7 and 8 a while back. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=129059 
>Unformatted:
