From owner-freebsd-arch@FreeBSD.ORG Mon Mar 24 20:10:43 2008 Return-Path: Delivered-To: arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E0581065676 for ; Mon, 24 Mar 2008 20:10:43 +0000 (UTC) (envelope-from jb@what-creek.com) Received: from what-creek.com (what-creek.com [66.111.37.70]) by mx1.freebsd.org (Postfix) with ESMTP id E9DA38FC14 for ; Mon, 24 Mar 2008 20:10:42 +0000 (UTC) (envelope-from jb@what-creek.com) Received: by what-creek.com (Postfix, from userid 102) id 864F573303; Mon, 24 Mar 2008 19:55:23 +0000 (GMT) Date: Mon, 24 Mar 2008 19:55:23 +0000 From: John Birrell To: arch@freebsd.org Message-ID: <20080324195523.GA97312@what-creek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Cc: Subject: Patch for CDDL file repo copy X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Mar 2008 20:10:43 -0000 In line with the core@ decision to have separate trees for CDDL, GPLv2 and GPLv3 files, here is a patch to deal with the existing CDDL files in current: This patch assumes the following directory trees are repo copied: src/contrib/opensolaris => src/cddl/contrib/opensolaris src/compat/opensolaris => src/cddl/compat/opensolaris src/sys/contrib/opensolaris => src/sys/cddl/contrib/opensolaris src/sys/compat/opensolaris => src/sys/cddl/compat/opensolaris Note that the compat/opensolaris directories contain some files that actually have a BSD license. These files have no use outside their current location. They have a BSD license simply because they were created from scratch by the author. It is possible in future that these BSD licensed files may required additional code which comes with a CDDL. In that event the CDDL will be added and the file will remain in it's current location. If this move is to happen at all, I'd like it to occur now because it affects the addition of DTrace to current. The next step after this is to add the extra compat files that DTrace needs and move some of the things that are currently built into the ZFS kernel module to an 'opensolaris' kernel module so that they can be shared with DTrace. -- John Birrell