| Message ID | 20200918210846.37797-4-tedd.an@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Luiz Von Dentz |
| Headers | show |
| Series | None | expand |
Hi Tedd, On Fri, Sep 18, 2020 at 2:17 PM <tedd.an@linux.intel.com> wrote: > > From: Tedd Ho-Jeong An <tedd.an@intel.com> > > This patch adds SPDX License Identifier and removes the license text. > > ------------------------------------- > License COUNT > ------------------------------------- > GPL-2.0-or-later : 2 > > License: GPL-2.0-or-later > btio/btio.h > btio/btio.c > --- > btio/btio.c | 15 +-------------- > btio/btio.h | 15 +-------------- > 2 files changed, 2 insertions(+), 28 deletions(-) > > diff --git a/btio/btio.c b/btio/btio.c > index 844d6007f..c18b6a012 100644 > --- a/btio/btio.c > +++ b/btio/btio.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later It still appears to be using C++ comment style. > /* > * > * BlueZ - Bluetooth protocol stack for Linux > @@ -6,20 +7,6 @@ > * Copyright (C) 2009-2010 Nokia Corporation > * > * > - * 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 of the License, 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > - * > */ > > #ifdef HAVE_CONFIG_H > diff --git a/btio/btio.h b/btio/btio.h > index 23e0ef72b..f0259cf1d 100644 > --- a/btio/btio.h > +++ b/btio/btio.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > /* > * > * BlueZ - Bluetooth protocol stack for Linux > @@ -6,20 +7,6 @@ > * Copyright (C) 2009-2010 Nokia Corporation > * > * > - * 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 of the License, 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. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, write to the Free Software > - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > - * > */ > #ifndef BT_IO_H > #define BT_IO_H > -- > 2.17.1 >
Hi Luiz, On Fri, 2020-09-18 at 15:13 -0700, Luiz Augusto von Dentz wrote: > Hi Tedd, > > On Fri, Sep 18, 2020 at 2:17 PM <tedd.an@linux.intel.com> wrote: > > From: Tedd Ho-Jeong An <tedd.an@intel.com> > > > > This patch adds SPDX License Identifier and removes the license text. > > > > ------------------------------------- > > License COUNT > > ------------------------------------- > > GPL-2.0-or-later : 2 > > > > License: GPL-2.0-or-later > > btio/btio.h > > btio/btio.c > > --- > > btio/btio.c | 15 +-------------- > > btio/btio.h | 15 +-------------- > > 2 files changed, 2 insertions(+), 28 deletions(-) > > > > diff --git a/btio/btio.c b/btio/btio.c > > index 844d6007f..c18b6a012 100644 > > --- a/btio/btio.c > > +++ b/btio/btio.c > > @@ -1,3 +1,4 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later > > It still appears to be using C++ comment style. That's how Linux kernel uses and checkpatch.pl check based on this rule. If use "//" in header file, checkpatch willl fail with something like this: WARNING:SPDX_LICENSE_TAG: Improper SPDX comment style for 'src/agent.h', please use '/*' instead #16: FILE: src/agent.h:1: +// SPDX-License-Identifier: GPL-2.0-or-later WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #16: FILE: src/agent.h:1: +// SPDX-License-Identifier: GPL-2.0-or-later Then, we need to turn off "SPDX_LICENSE_TAG" flag from checkpatch rule... > > > /* > > * > > * BlueZ - Bluetooth protocol stack for Linux > > @@ -6,20 +7,6 @@ > > * Copyright (C) 2009-2010 Nokia Corporation > > * > > * > > - * 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 of the License, 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. > > - * > > - * You should have received a copy of the GNU General Public License > > - * along with this program; if not, write to the Free Software > > - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110- > > 1301 USA > > - * > > */ > > > > #ifdef HAVE_CONFIG_H > > diff --git a/btio/btio.h b/btio/btio.h > > index 23e0ef72b..f0259cf1d 100644 > > --- a/btio/btio.h > > +++ b/btio/btio.h > > @@ -1,3 +1,4 @@ > > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > > /* > > * > > * BlueZ - Bluetooth protocol stack for Linux > > @@ -6,20 +7,6 @@ > > * Copyright (C) 2009-2010 Nokia Corporation > > * > > * > > - * 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 of the License, 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. > > - * > > - * You should have received a copy of the GNU General Public License > > - * along with this program; if not, write to the Free Software > > - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110- > > 1301 USA > > - * > > */ > > #ifndef BT_IO_H > > #define BT_IO_H > > -- > > 2.17.1 > > > >
diff --git a/btio/btio.c b/btio/btio.c index 844d6007f..c18b6a012 100644 --- a/btio/btio.c +++ b/btio/btio.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * * BlueZ - Bluetooth protocol stack for Linux @@ -6,20 +7,6 @@ * Copyright (C) 2009-2010 Nokia Corporation * * - * 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 of the License, 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * */ #ifdef HAVE_CONFIG_H diff --git a/btio/btio.h b/btio/btio.h index 23e0ef72b..f0259cf1d 100644 --- a/btio/btio.h +++ b/btio/btio.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * * BlueZ - Bluetooth protocol stack for Linux @@ -6,20 +7,6 @@ * Copyright (C) 2009-2010 Nokia Corporation * * - * 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 of the License, 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * */ #ifndef BT_IO_H #define BT_IO_H
From: Tedd Ho-Jeong An <tedd.an@intel.com> This patch adds SPDX License Identifier and removes the license text. ------------------------------------- License COUNT ------------------------------------- GPL-2.0-or-later : 2 License: GPL-2.0-or-later btio/btio.h btio/btio.c --- btio/btio.c | 15 +-------------- btio/btio.h | 15 +-------------- 2 files changed, 2 insertions(+), 28 deletions(-)