From owner-freebsd-arch@FreeBSD.ORG Tue Jul 6 08:50:12 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 C43F21065680; Tue, 6 Jul 2010 08:50:12 +0000 (UTC) (envelope-from uqs@spoerlein.net) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2001:470:9a47::1]) by mx1.freebsd.org (Postfix) with ESMTP id 3CFF78FC1D; Tue, 6 Jul 2010 08:50:12 +0000 (UTC) Received: from roadrunner.spoerlein.net (ip-83-147-137-138.dsl.digiweb.ie [83.147.137.138]) by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id o668o4cM086253 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 6 Jul 2010 10:50:10 +0200 (CEST) (envelope-from uqs@spoerlein.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=spoerlein.net; s=dkim200908; t=1278406211; bh=XvtuGMu9o2g0xYlnYdrsKekV9GKCAleH9ZWwpJFTPpk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=P7hu6DrU2SkKeltAkwp7oT8+hbh9HAKviwgthzz8fXGqk/XjtNop+iZF11I34l51E izXQEBSTCkbYdWo6bYANSXMejIQH0dAz/qTt37RLyjnZ+g6JbBmC52lGt9IMC9Wxl4 8QHPlDLeH422xyySypsZSZjJIhTu/lh7RslmfGeg= Received: from roadrunner.spoerlein.net (localhost [127.0.0.1]) by roadrunner.spoerlein.net (8.14.4/8.14.4) with ESMTP id o668kXdJ006291 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 6 Jul 2010 09:46:33 +0100 (IST) (envelope-from uqs@spoerlein.net) Received: (from uqs@localhost) by roadrunner.spoerlein.net (8.14.4/8.14.4/Submit) id o668kVV0006290; Tue, 6 Jul 2010 09:46:31 +0100 (IST) (envelope-from uqs@spoerlein.net) Date: Tue, 6 Jul 2010 09:46:30 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Rui Paulo Message-ID: <20100706084630.GA6191@roadrunner.spoerlein.net> Mail-Followup-To: Rui Paulo , freebsd-arch@freebsd.org References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) 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 08:50:12 -0000 On Mon, 05.07.2010 at 19:56:19 +0100, 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 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 ... Uli