Date: Mon, 2 Jul 2012 16:10:26 -0700 (PDT) From: Pedro Giffuni <pfg@freebsd.org> To: obrien@freebsd.org Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r237624 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize cddl/contrib/opensolaris/lib/libdtrace/common sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/c... Message-ID: <1341270626.1322.YahooMailClassic@web113509.mail.gq1.yahoo.com> In-Reply-To: <20120702210438.GA85618@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
=0A=0A--- Lun 2/7/12, David O'Brien <obrien@freebsd.org> ha scritto:=0A...=
=0A> =0A> At this point Illumos is the continuation of OpenSolaris.=0A> Whe=
n Solaris 11 came out there was a discussion about if=0A> Oracle will fulfi=
ll the statement in their leaked email=0A> about publishing sources again.=
=A0 There is little to no=0A> hope in the Illumos community this will ever =
happen.=0A=0AI tend to agree with the Illumos community on that however=0Aw=
e may still be seeing some movement in that area. Oracle=0Ahas a linux dist=
ribution and commercial interests are=0Aalways strong in unpredicable ways.=
=0A=0AOracle has been porting Dtrace to Linux. Apparently they=0Awill be ad=
opting dual GPLv2/CDDL for some few kernel=0Astuff and CDDL only for the ma=
in code, but just the same=0Athere may be some stuff we want to take from t=
hem.=0A=0A> =0A> It may be conceptually cleaner to import into=0A> '^/vendo=
r{,-sys}/illumos', but I believe that will cause=0A> issues with importing =
updates to existing files=0A> (e.g., r237458) as the 'svn merge'=0A> from '=
^/vendor{,-sys}' will get messy.=A0 I believe we=0A> may have to resort=0A>=
to a three-way merge using "--ignore-ancestry" -- something=0A> I don't be=
lieve we want to do.=0A> =0A=0AI think Martin Matuska did exactly the right=
thing:=0Ahe created the illumos vendor branch starting from=0Athe opensola=
ris branch.=0A=0A> Thus I think this needs to be discussed with the repo=0A=
> Meisters.=0A> =0A> =0A> > If somehow Oracle decides to relicense Dtrace o=
r ZFS=0A> we=0A> > still must keep these changes isolated from the code=0A>=
> provided in the vendor branch.=0A> =0A> I don't quite follow.=0A> =0A> L=
ets suppose we don't import anything from Illumos, but wait=0A> for the=0A>=
Solaris 11 code drop.=A0 Should DTrace or ZFS be=0A> relicensed, IMHO it=
=0A> should still get imported into '^/vendor{,-sys}/opensolaris'=0A> as th=
at=0A> is the progression of that Intellectual Property.=0A> '^/vendor{,-sy=
s}/opensolaris' states no license.=A0 What=0A> we would have to=0A> do is '=
svn move' the resulting merge outside of=0A> 'head/{,sys}/cddl/'.=0A> =0A> =
=0A> =0A> > I think we have to decide if we are going to consider=0A> > Ill=
umos a vendor on it's own. For ZFS it would seem=0A> > the right thing to d=
o, for Dtrace I am not sure: at=0A> > least I am not considering bringing a=
ny other feature=0A> > at this time.=0A> =0A> Given the number of primary a=
uthors & architects of both=0A> ZFS and=0A> DTrace that have left Oracle/Su=
n, the works of those folks=0A> are the=0A> things I believe FreeBSD is int=
erested in.=A0 In fact the=0A> ZFS Working=0A> Group is external to Oracle =
and Solaris.=0A> =0A=0AI am somewhat biased here because I am a committer i=
n=0AApache OpenOffice and I have find it very valuable that=0ASUN/Oracle ke=
pt the Contributor License Agreements in=0Aplace to effectively permit reli=
censing.=0A=0AConcerning ZFS: the main developer of the encryption stuff=0A=
did stay at Oracle. At this time that code will not be seen=0Ain the open (=
apparently there was a Solaris 11 source leak=0Abut that's not something we=
can touch), but we just never=0Aknow.=0A=0A> Doesn't this commit of yours =
which brought in new DTrace=0A> work by Joyent=0A> (likely Brendan Gregg or=
Bryan Cantrill) show this point?=0A> =0A> Perhaps we should do an 'svn mov=
e' of=0A> '^/vendor{,-sys}/opensolaris'=0A> to '^/vendor{,-sys}/illumos'?=
=0A> =0A=0AIllumos is a fork so svn copy works just fine for this, plus=0Ac=
opying is a very cheap operation in SVN.=0A=0ACheers,=0A=0APedro.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1341270626.1322.YahooMailClassic>