From owner-freebsd-arch@FreeBSD.ORG Wed Jul 7 14:59:30 2010 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B082A1065674 for ; Wed, 7 Jul 2010 14:59:30 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 773FE8FC17 for ; Wed, 7 Jul 2010 14:59:30 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 1A39346B53 for ; Wed, 7 Jul 2010 10:59:30 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id BA8DB8A03C for ; Wed, 7 Jul 2010 10:59:28 -0400 (EDT) From: John Baldwin To: freebsd-arch@freebsd.org Date: Wed, 7 Jul 2010 10:12:10 -0400 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20100217; KDE/4.4.5; amd64; ; ) References: In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201007071012.10206.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Wed, 07 Jul 2010 10:59:28 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Subject: Re: Cleaning up the CDDL import mess 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: Wed, 07 Jul 2010 14:59:30 -0000 On Monday, July 05, 2010 2:56:19 pm Rui Paulo wrote: > Right now we have four locations for CDDL import code: > > 1) vendor-cddl > 2) vendor/opensolaris > 3) vendor-sys/opensolaris > 4) and... HEAD itself. > > 1) vendor-cddl seems to be the first DTrace import and it's probably ready to be svn rm'ed because it creates too much confusion. The first thing someone who is looking at CDDL source is to probably look at vendor-cddl and I would like to avoid this. > But I don't know what will happen to the mergeinfo in head/cddl and head/sys/cddl (I think no harm will be done). > > 2 and 3) These are the correct locations IMHO and I know that jhb did move the code here in the past. > > 4) The ZFS code lives in HEAD, unfortunately. I thought the policy was to have a vendor import for vendor code so that we could merge *from* upstream more easily. I was told that this is being done to some extent in Perforce, but I don't know how acceptable this to the community. > > I need to import some DTrace code into 2 and 3, but I would like to svn rm vendor-cddl, if there are no objections. I think it should be fine to remove vendor-cddl. It would be useful to get the ZFS bits the correspond to our current ZFS bits committed into the vendor/opensolaris and vendor-sys/opensolaris trees and to sync up the merge info. However, one caveat with the ZFS bits is that we may want to keep ZFS and DTrace independent in that you don't want to have to force an upgrade of ZFS just to get newer DTrace bits and vice versa. In that sense, it may make sense to store the vendor DTrace and ZFS bits in separate trees. I'm not sure how practical that is (e.g. if they share common code). -- John Baldwin