Date: Fri, 27 Dec 2019 23:08:14 -0500 From: Pedro Giffuni <pfg@FreeBSD.org> To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r356142 - in head/sys: dev/ofw sys Message-ID: <31c49f48-db69-4b8b-54d0-8e575bb3d2f4@FreeBSD.org> In-Reply-To: <201912280316.xBS3GFEt041168@gndrsh.dnsmgr.net> References: <201912280316.xBS3GFEt041168@gndrsh.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2019-12-27 22:16, Rodney W. Grimes wrote: >> Author: pfg >> Date: Sat Dec 28 02:58:30 2019 >> New Revision: 356142 >> URL: https://svnweb.freebsd.org/changeset/base/356142 >> >> Log: >> SPDX: update some tags with two licenses. >> >> Modified: >> head/sys/dev/ofw/openfirm.h >> head/sys/sys/sched.h >> >> Modified: head/sys/dev/ofw/openfirm.h >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/dev/ofw/openfirm.h Sat Dec 28 02:11:41 2019 (r356141) >> +++ head/sys/dev/ofw/openfirm.h Sat Dec 28 02:58:30 2019 (r356142) >> @@ -1,7 +1,7 @@ >> /* $NetBSD: openfirm.h,v 1.1 1998/05/15 10:16:00 tsubai Exp $ */ >> =20 >> /*- >> - * SPDX-License-Identifier: BSD-4-Clause >> + * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause-FreeBSD) >> * >> * Copyright (C) 1995, 1996 Wolfgang Solfrank. >> * Copyright (C) 1995, 1996 TooLs GmbH. >> >> Modified: head/sys/sys/sched.h >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sys/sys/sched.h Sat Dec 28 02:11:41 2019 (r356141) >> +++ head/sys/sys/sched.h Sat Dec 28 02:58:30 2019 (r356142) >> @@ -1,5 +1,5 @@ >> /*- >> - * SPDX-License-Identifier: BSD-4-Clause >> + * SPDX-License-Identifier: (BSD-4-Clause AND BSD-2-Clause-FreeBSD) >> * >> * Copyright (c) 1996, 1997 >> * HD Associates, Inc. All rights reserved. >> > This situation should not of occured, and leads to an ambigous license = state. It actually happens a lot (I mean two or more licenses in the same file): SPDX explicitly uses AND (not OR) for cases like this. > What code is under license 2 clause and what under 4 clause?=20 Anyone redistributing the file has to respect both licenses. If you are lucky enough to have access to version control you may be able to discern the author and the corresponding license, otherwise you are trapped with both. > It looks to me as if this was done by Jeff Robinson as the 2 clause is > attached to his copyright and we should probably just ask him to relax > that back to the files existing 4 clause license, and or go after Greg > Ansley of HD associtates to get them to relax the 4 clause. > No, Jeff (or anyone else, as I said there are many cases in our tree) is entitled to choose his own license as long as it is compatible with the pre-existing licensing. Pedro.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?31c49f48-db69-4b8b-54d0-8e575bb3d2f4>