| Message ID | 20210331134502.17297-9-toertel@gmail.com |
|---|---|
| State | RFC |
| Headers | show |
| Series | Make SWUpdate REUSE-compliant | expand |
Hi Stefano, On Wed, Mar 31, 2021 at 3:45 PM Mark Jonas <toertel@gmail.com> wrote: > > Signed-off-by: Mark Jonas <toertel@gmail.com> > --- > mongoose/Config.in | 5 +++++ > mongoose/Makefile | 6 ++++++ > mongoose/mongoose.c | 2 +- > mongoose/mongoose.h | 6 +++--- > 4 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/mongoose/Config.in b/mongoose/Config.in > index e0944fd..89a81fb 100644 > --- a/mongoose/Config.in > +++ b/mongoose/Config.in > @@ -1,3 +1,8 @@ > +# SPDX-FileCopyrightText: 2013 Stefano Babic <sbabic@denx.de> > +# SPDX-FileCopyrightText: 2018 Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > +# > +# SPDX-License-Identifier: GPL-2.0-or-later > + > menuconfig WEBSERVER > bool "Web Server" > select MONGOOSE > diff --git a/mongoose/Makefile b/mongoose/Makefile > index 851a476..620c0f4 100644 > --- a/mongoose/Makefile > +++ b/mongoose/Makefile > @@ -1,3 +1,9 @@ > +# SPDX-FileCopyrightText: 2013 Stefano Babic <sbabic@denx.de> > +# SPDX-FileCopyrightText: 2018 Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > +# SPDX-FileCopyrightText: 2020 Bastian Germann <bastiangermann@fishpost.de> I would like to discuss which path we would like to take for setting the copyright notice of a file. Here, the original file did not have a copyright notice. So one way how to deal with that would be going through the file's Git history and taking a good guess which author's contribution crossed the threshold of originality. This is a lot of work and will only be based on good intentions and a review. But it can be done. Alternatively we could decide to be a lot more pragmatic: If nobody claimed copyright before then the copyright will be assigned to the initial author. In this example it would only leave you, Stefano. Of course, if a file already has a copyright claim but it does not trigger the REUSE heuristic (symbol © or word Copyright) then this copyright statement will be prefixed with the SPDX-FileCopyrightText tag. No further information from the Git history will be added. > +# > +# SPDX-License-Identifier: GPL-2.0-or-later > + > ifneq ($(CONFIG_WEBSERVER),) > ifneq ($(CONFIG_MONGOOSE),) > KBUILD_CFLAGS += -DMG_ENABLE_HTTP_STREAMING_MULTIPART=1 > diff --git a/mongoose/mongoose.c b/mongoose/mongoose.c > index aa23471..03bfad3 100644 > --- a/mongoose/mongoose.c > +++ b/mongoose/mongoose.c > @@ -3,7 +3,7 @@ > * Copyright (c) 2013-2020 Cesanta Software Limited > * All rights reserved > * > - * SPDX-License-Identifier: GPL-2.0 > + * SPDX-License-Identifier: GPL-2.0-only > * > * This software is dual-licensed: you can redistribute it and/or modify > * it under the terms of the GNU General Public License version 2 as > diff --git a/mongoose/mongoose.h b/mongoose/mongoose.h > index 5ee502d..cbad947 100644 > --- a/mongoose/mongoose.h > +++ b/mongoose/mongoose.h > @@ -3,6 +3,8 @@ > * Copyright (c) 2013-2020 Cesanta Software Limited > * All rights reserved > * > + * SPDX-License-Identifier: GPL-2.0-only > + * > * This software is dual-licensed: you can redistribute it and/or modify > * it under the terms of the GNU General Public License version 2 as > * published by the Free Software Foundation. For the terms of this > @@ -15,9 +17,7 @@ > * > * Alternatively, you can license this software under a commercial > * license, as set out in <https://www.cesanta.com/license>. > - * > - * SPDX-License-Identifier: GPL-2.0 > - */ > + */ > > #ifdef MG_MODULE_LINES > #line 1 "mongoose/src/mg_common.h" > -- > 2.25.1 > Cheers, Mark
Hi Mark, On 31.03.21 20:08, Mark Jonas wrote: > Hi Stefano, > > On Wed, Mar 31, 2021 at 3:45 PM Mark Jonas <toertel@gmail.com> wrote: >> >> Signed-off-by: Mark Jonas <toertel@gmail.com> >> --- >> mongoose/Config.in | 5 +++++ >> mongoose/Makefile | 6 ++++++ >> mongoose/mongoose.c | 2 +- >> mongoose/mongoose.h | 6 +++--- >> 4 files changed, 15 insertions(+), 4 deletions(-) >> >> diff --git a/mongoose/Config.in b/mongoose/Config.in >> index e0944fd..89a81fb 100644 >> --- a/mongoose/Config.in >> +++ b/mongoose/Config.in >> @@ -1,3 +1,8 @@ >> +# SPDX-FileCopyrightText: 2013 Stefano Babic <sbabic@denx.de> >> +# SPDX-FileCopyrightText: 2018 Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> >> +# >> +# SPDX-License-Identifier: GPL-2.0-or-later >> + >> menuconfig WEBSERVER >> bool "Web Server" >> select MONGOOSE >> diff --git a/mongoose/Makefile b/mongoose/Makefile >> index 851a476..620c0f4 100644 >> --- a/mongoose/Makefile >> +++ b/mongoose/Makefile >> @@ -1,3 +1,9 @@ >> +# SPDX-FileCopyrightText: 2013 Stefano Babic <sbabic@denx.de> >> +# SPDX-FileCopyrightText: 2018 Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> >> +# SPDX-FileCopyrightText: 2020 Bastian Germann <bastiangermann@fishpost.de> > > I would like to discuss which path we would like to take for setting > the copyright notice of a file. Here, the original file did not have a > copyright notice. So one way how to deal with that would be going > through the file's Git history and taking a good guess which author's > contribution crossed the threshold of originality. This is a lot of > work and will only be based on good intentions and a review. But it > can be done. I created most of files, I can find which files were created by someone else in the GIT history. > > Alternatively we could decide to be a lot more pragmatic: If nobody > claimed copyright before then the copyright will be assigned to the > initial author. In this example it would only leave you, Stefano. Let's do if this cannot be done via git history, there will be just a few files where I am not the original author. > > Of course, if a file already has a copyright claim but it does not > trigger the REUSE heuristic (symbol © or word Copyright) then this > copyright statement will be prefixed with the SPDX-FileCopyrightText > tag. No further information from the Git history will be added. > >> +# >> +# SPDX-License-Identifier: GPL-2.0-or-later >> + >> ifneq ($(CONFIG_WEBSERVER),) >> ifneq ($(CONFIG_MONGOOSE),) >> KBUILD_CFLAGS += -DMG_ENABLE_HTTP_STREAMING_MULTIPART=1 >> diff --git a/mongoose/mongoose.c b/mongoose/mongoose.c >> index aa23471..03bfad3 100644 >> --- a/mongoose/mongoose.c >> +++ b/mongoose/mongoose.c >> @@ -3,7 +3,7 @@ >> * Copyright (c) 2013-2020 Cesanta Software Limited >> * All rights reserved >> * >> - * SPDX-License-Identifier: GPL-2.0 >> + * SPDX-License-Identifier: GPL-2.0-only >> * >> * This software is dual-licensed: you can redistribute it and/or modify >> * it under the terms of the GNU General Public License version 2 as >> diff --git a/mongoose/mongoose.h b/mongoose/mongoose.h >> index 5ee502d..cbad947 100644 >> --- a/mongoose/mongoose.h >> +++ b/mongoose/mongoose.h >> @@ -3,6 +3,8 @@ >> * Copyright (c) 2013-2020 Cesanta Software Limited >> * All rights reserved >> * >> + * SPDX-License-Identifier: GPL-2.0-only >> + * >> * This software is dual-licensed: you can redistribute it and/or modify >> * it under the terms of the GNU General Public License version 2 as >> * published by the Free Software Foundation. For the terms of this >> @@ -15,9 +17,7 @@ >> * >> * Alternatively, you can license this software under a commercial >> * license, as set out in <https://www.cesanta.com/license>. >> - * >> - * SPDX-License-Identifier: GPL-2.0 >> - */ >> + */ >> >> #ifdef MG_MODULE_LINES >> #line 1 "mongoose/src/mg_common.h" >> -- >> 2.25.1 >> > > Cheers, > Mark > Regards, Stefano
diff --git a/mongoose/Config.in b/mongoose/Config.in index e0944fd..89a81fb 100644 --- a/mongoose/Config.in +++ b/mongoose/Config.in @@ -1,3 +1,8 @@ +# SPDX-FileCopyrightText: 2013 Stefano Babic <sbabic@denx.de> +# SPDX-FileCopyrightText: 2018 Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> +# +# SPDX-License-Identifier: GPL-2.0-or-later + menuconfig WEBSERVER bool "Web Server" select MONGOOSE diff --git a/mongoose/Makefile b/mongoose/Makefile index 851a476..620c0f4 100644 --- a/mongoose/Makefile +++ b/mongoose/Makefile @@ -1,3 +1,9 @@ +# SPDX-FileCopyrightText: 2013 Stefano Babic <sbabic@denx.de> +# SPDX-FileCopyrightText: 2018 Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> +# SPDX-FileCopyrightText: 2020 Bastian Germann <bastiangermann@fishpost.de> +# +# SPDX-License-Identifier: GPL-2.0-or-later + ifneq ($(CONFIG_WEBSERVER),) ifneq ($(CONFIG_MONGOOSE),) KBUILD_CFLAGS += -DMG_ENABLE_HTTP_STREAMING_MULTIPART=1 diff --git a/mongoose/mongoose.c b/mongoose/mongoose.c index aa23471..03bfad3 100644 --- a/mongoose/mongoose.c +++ b/mongoose/mongoose.c @@ -3,7 +3,7 @@ * Copyright (c) 2013-2020 Cesanta Software Limited * All rights reserved * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0-only * * This software is dual-licensed: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/mongoose/mongoose.h b/mongoose/mongoose.h index 5ee502d..cbad947 100644 --- a/mongoose/mongoose.h +++ b/mongoose/mongoose.h @@ -3,6 +3,8 @@ * Copyright (c) 2013-2020 Cesanta Software Limited * All rights reserved * + * SPDX-License-Identifier: GPL-2.0-only + * * This software is dual-licensed: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. For the terms of this @@ -15,9 +17,7 @@ * * Alternatively, you can license this software under a commercial * license, as set out in <https://www.cesanta.com/license>. - * - * SPDX-License-Identifier: GPL-2.0 - */ + */ #ifdef MG_MODULE_LINES #line 1 "mongoose/src/mg_common.h"
Signed-off-by: Mark Jonas <toertel@gmail.com> --- mongoose/Config.in | 5 +++++ mongoose/Makefile | 6 ++++++ mongoose/mongoose.c | 2 +- mongoose/mongoose.h | 6 +++--- 4 files changed, 15 insertions(+), 4 deletions(-)