From owner-freebsd-hackers@FreeBSD.ORG Fri Oct 5 16:17:37 2012 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 49B701065672; Fri, 5 Oct 2012 16:17:37 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id 1B3A08FC08; Fri, 5 Oct 2012 16:17:37 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 72BE7B94B; Fri, 5 Oct 2012 12:17:36 -0400 (EDT) From: John Baldwin To: Brooks Davis Date: Fri, 5 Oct 2012 11:47:47 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p20; KDE/4.5.5; amd64; ; ) References: <20120924213137.GA76898@lor.one-eyed-alien.net> <201209250841.34134.jhb@freebsd.org> <20121005003136.GB84375@lor.one-eyed-alien.net> In-Reply-To: <20121005003136.GB84375@lor.one-eyed-alien.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201210051147.47411.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Fri, 05 Oct 2012 12:17:36 -0400 (EDT) Cc: freebsd-hackers@freebsd.org, hackers@freebsd.org Subject: Re: vendor import questions X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2012 16:17:37 -0000 On Thursday, October 04, 2012 8:31:36 pm Brooks Davis wrote: > On Tue, Sep 25, 2012 at 08:41:34AM -0400, John Baldwin wrote: > > On Monday, September 24, 2012 5:31:37 pm Brooks Davis wrote: > > > As part of switching to NetBSD's mtree I plan to import their versions > > > of a few files that are part of libc (for example all the bits of > > > vis/unvis). I would like to do that via a vendor import, but I'm unsure > > > where to put the files and how to tag them. For mtree itself the right > > > place is clearly base/vendor/NetBSD/mtree/dist, but we don't seem to > > > have a good example for libc bits. > > > > > > There is currently a base/vendor/NetBSD/dist directory containing a > > > (very) partial source tree, but it seems to be unused in recent times. > > > If I did import into that tree, the next question would be how to tag > > > the import. The base/vendor/NetBSD/fparseln_19990920/ directory shows > > > one seemingly sensible example, but I don't like the resulting explosion > > > of top level directories. I also worry that having mixed versions in the > > > libc directory would make any attempt at sensible merging difficult > > > since we'd have to put mergeinfo on files. > > > > > > An additional issue is where to put the files in the source tree. > > > Precedent seems to favor direct copies to src/lib/libc/gen etc. In some > > > ways I think the optimal solution would be to put the bits in contrib > > > in feature specific directories like contrib/libc/vis, but that might > > > be annoying for some consumers. That being said, the existence if > > > src/include means you can't simply check out libc so it's probably ok to > > > add more locations in the source tree for a good cause. > > > > > > What's the right way to go here? > > > > libc already has contrib bits (contrib/gdtoa). I think something like > > contrib/NetBSD/libc/ might be fine. The problem I have with just > > 'contrib/libc' is that it is ambiguous. OTOH, the contrib/NetBSD/libc > > path isn't too pretty either. One option would be to merge directly from > > the vendor area into src/lib/libc. One other option might be to just > > do src/contrib/vis if it is only for 'vis' files. > > I'm leaning towards src/contrib/libc-vis. That would also work well in > vendor/NetBSD since I could do vendor/NetBSD/libc-vis/dist. I think that is fine. -- John Baldwin