On 1/19/21 5:34 PM, Richard Palethorpe wrote: > Hello All, > > Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> writes: > >> On 1/19/21 4:06 PM, Cyril Hrubis wrote: >>> Hi! >>>>> /* >>>>> - * tst-rcv-own-msgs.c >>>>> - * >>>>> - * Copyright (c) 2010 Volkswagen Group Electronic Research >>>>> - * All rights reserved. >>>>> - * >>>>> - * Redistribution and use in source and binary forms, with or without >>>>> - * modification, are permitted provided that the following conditions >>>>> - * are met: >>>>> - * 1. Redistributions of source code must retain the above copyright >>>>> - * notice, this list of conditions and the following disclaimer. >>>>> - * 2. Redistributions in binary form must reproduce the above copyright >>>>> - * notice, this list of conditions and the following disclaimer in the >>>>> - * documentation and/or other materials provided with the distribution. >>>>> - * 3. Neither the name of Volkswagen nor the names of its contributors >>>>> - * may be used to endorse or promote products derived from this software >>>>> - * without specific prior written permission. >>>> >>>> IANAL, I think you're missing this license. Is looks like some sort >>>> of BSD to me. > > Ufff, thanks, I should pay more attention when it is a test imported > from elsewhere. > >>>> >>>>> - * >>>>> - * Alternatively, provided that this notice is retained in full, this >>>>> - * software may be distributed under the terms of the GNU General >>>>> - * Public License ("GPL") version 2, in which case the provisions of the >>>>> - * GPL apply INSTEAD OF those given above. >>>> >>>> It doesn't say "or later". >>> >>> Looks like we cannot just remove this license. So what about moving this >>> text into a separate COPYING file and changing the SPDX to GPL-v2.0? >> >> This file is dual licensed, better keep it dual licensed. >> >> regards, >> Marc > > HHmm, this appears to be the BSD-3-Clause license with the following > text inserted in the middle: > > * Alternatively, provided that this notice is retained in full, this > * software may be distributed under the terms of the GNU General > * Public License ("GPL") version 2, in which case the provisions of the > * GPL apply INSTEAD OF those given above. > * > * The provided data structures and external interfaces from this code > * are not restricted to be used by modules with a GPL compatible license. > > I don't see any corresponding SPDX identifier or exception for this. It > is probably easiest and safest just to keep it as-is. I think the Linux kernel uses: /* SPDX-License-Identifier: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) */ e.g.: https://elixir.bootlin.com/linux/v5.10/source/include/uapi/linux/can/gw.h Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: OpenPGP digital signature