From owner-freebsd-arch@FreeBSD.ORG Tue Jul 6 09:03:58 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 13E18106566B for ; Tue, 6 Jul 2010 09:03:58 +0000 (UTC) (envelope-from rpaulo@freebsd.org) Received: from karen.lavabit.com (karen.lavabit.com [72.249.41.33]) by mx1.freebsd.org (Postfix) with ESMTP id AD9218FC15 for ; Tue, 6 Jul 2010 09:03:57 +0000 (UTC) Received: from e.earth.lavabit.com (e.earth.lavabit.com [192.168.111.14]) by karen.lavabit.com (Postfix) with ESMTP id 1212D11BA75; Tue, 6 Jul 2010 04:03:56 -0500 (CDT) Received: from 10.0.10.3 (54.81.54.77.rev.vodafone.pt [77.54.81.54]) by lavabit.com with ESMTP id 9GTPB4ESBGSQ; Tue, 06 Jul 2010 04:03:53 -0500 Mime-Version: 1.0 (Apple Message framework v1081) Content-Type: text/plain; charset=iso-8859-1 From: Rui Paulo In-Reply-To: <20100706084630.GA6191@roadrunner.spoerlein.net> Date: Tue, 6 Jul 2010 10:03:50 +0100 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20100706084630.GA6191@roadrunner.spoerlein.net> To: =?iso-8859-1?Q?Ulrich_Sp=F6rlein?= X-Mailer: Apple Mail (2.1081) Cc: freebsd-arch@freebsd.org 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: Tue, 06 Jul 2010 09:03:58 -0000 On 6 Jul 2010, at 09:46, Ulrich Sp=F6rlein wrote: > On Mon, 05.07.2010 at 19:56:19 +0100, Rui Paulo wrote: >> Right now we have four locations for CDDL import code: >>=20 >> 1) vendor-cddl >> 2) vendor/opensolaris >> 3) vendor-sys/opensolaris >> 4) and... HEAD itself. >>=20 >> 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). >>=20 >> 2 and 3) These are the correct locations IMHO and I know that jhb did = move the code here in the past. >>=20 >> 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. >>=20 >> 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. >=20 > I don't get why we even have a vendor-sys and vendor-crypto and would > like to see all of them moved into one common vendor tree. Just my two > cents ... That's actually another problem that I do not want to tackle right now. = What I do want to do is get rid of vendor-cddl. Then we can think about = the others... Regards, -- Rui Paulo