Hello, On Wed, May 20, 2020 at 02:10:47PM +0200, Ahmad Fatoum wrote: > On 5/19/20 6:52 PM, Uwe Kleine-König wrote: > > This adapts all files that were identifed by licensecheck > > (https://salsa.debian.org/build-common-team/licensecheck.git) as > > licensed under the GPL and that have a (IMHO) clear copyright statement. > > > > The advantage is that these specifiers are machine-parseable which helps > > license conformance, e.g. for packaging barebox in Debian. > > > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > > --- > > drivers/pwm/core.c | 15 +++------------ > > drivers/pwm/pwm-mxs.c | 12 ++---------- > > drivers/pwm/pxa_pwm.c | 6 ++---- > > 3 files changed, 7 insertions(+), 26 deletions(-) > > > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > > index 05dad93e5ce3..878f4d72bbf5 100644 > > --- a/drivers/pwm/core.c > > +++ b/drivers/pwm/core.c > > @@ -1,17 +1,8 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > +// SPDX-FileCopyrightText: 2011 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > > + > > /* > > * Generic pwmlib implementation > > - * > > - * Copyright (C) 2011 Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > > - * > > - * This program is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License as published by > > - * the Free Software Foundation; either version 2, or (at your option) > > - * any later version. > > - * > > - * This program is distributed in the hope that it will be useful, > > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > > - * GNU General Public License for more details. > > */ > > #include <common.h> > > #include <errno.h> > > diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c > > index a06040ac3268..1e2db39def22 100644 > > --- a/drivers/pwm/pwm-mxs.c > > +++ b/drivers/pwm/pwm-mxs.c > > @@ -1,13 +1,5 @@ > > -/* > > - * Copyright 2012 Freescale Semiconductor, Inc. > > - * > > - * The code contained herein is licensed under the GNU General Public > > - * License. You may obtain a copy of the GNU General Public License > > - * Version 2 or later at the following locations: > > - * > > - * http://www.opensource.org/licenses/gpl-license.html > > - * http://www.gnu.org/copyleft/gpl.html > > - */ > > +// SPDX-License-Identifier: GPL-2.0-only > > The deleted text says "or later" Strange as I didn't do this manually. My scratch-pad has: add_license() { git grep -L SPDX-License-Identifier | grep -E '\.(c|cpp|h)$' | xargs licensecheck | awk -F: '$2 == " '"$1"'" {print $1}' | xargs sed -i "1i // SPDX-License-Identifier: $2" } add_license "GPL (v2)" "GPL-2.0-only" add_license "GPL (v2 or later)" "GPL-2.0-or-later" which does the right thing when I rety it. I just rechecked the other patches I created and this is the only problematic change. @Sascha: can you fix up here please? @Ahmad: Thanks for your attention. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ | _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
