* [OSS-Tools] [PATCH dt-utils 2/4] treewide: add SPDX identifiers to files with GPL-2.0-only license
2021-03-26 21:06 [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
@ 2021-03-26 21:06 ` Roland Hieber
2021-03-30 12:50 ` Uwe Kleine-König
2021-03-26 21:06 ` [OSS-Tools] [PATCH dt-utils 3/4] treewide: add SPDX identifier to files with Zlib license Roland Hieber
` (4 subsequent siblings)
5 siblings, 1 reply; 19+ messages in thread
From: Roland Hieber @ 2021-03-26 21:06 UTC (permalink / raw)
To: oss-tools; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
src/barebox-state.c | 10 +---------
src/barebox-state/backend_bucket_circular.c | 11 +----------
src/barebox-state/backend_bucket_direct.c | 11 +----------
src/barebox-state/backend_format_dtb.c | 11 +----------
src/barebox-state/backend_format_raw.c | 11 +----------
src/barebox-state/backend_storage.c | 11 +----------
src/crypto/digest.c | 12 +-----------
src/crypto/hmac.c | 3 +--
src/crypto/internal.h | 3 +--
src/crypto/keystore.h | 12 +-----------
src/digest.h | 12 +-----------
src/dtblint-imx-pinmux.c | 5 +----
src/dtblint.c | 5 +----
src/fdt.c | 10 +---------
src/keystore-blob.c | 5 +----
src/libdt.c | 10 +---------
16 files changed, 16 insertions(+), 126 deletions(-)
diff --git a/src/barebox-state.c b/src/barebox-state.c
index 334aed6f3d43..d96fe02f1f53 100644
--- a/src/barebox-state.c
+++ b/src/barebox-state.c
@@ -1,16 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* state.c - state handling tool
*
* Copyright (c) 2014 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * This program is free software; 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.
- *
- * 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 <dirent.h>
diff --git a/src/barebox-state/backend_bucket_circular.c b/src/barebox-state/backend_bucket_circular.c
index 735510e0d36b..bab001534aa1 100644
--- a/src/barebox-state/backend_bucket_circular.c
+++ b/src/barebox-state/backend_bucket_circular.c
@@ -1,15 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2016 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
- *
- * This program is free software; 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.
- *
- * 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 <asm-generic/ioctl.h>
diff --git a/src/barebox-state/backend_bucket_direct.c b/src/barebox-state/backend_bucket_direct.c
index 4522f0170f3d..1d930396ea4c 100644
--- a/src/barebox-state/backend_bucket_direct.c
+++ b/src/barebox-state/backend_bucket_direct.c
@@ -1,15 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2016 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
- *
- * This program is free software; 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.
- *
- * 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 <fcntl.h>
diff --git a/src/barebox-state/backend_format_dtb.c b/src/barebox-state/backend_format_dtb.c
index 48f30db1f5f9..a078f528f6ef 100644
--- a/src/barebox-state/backend_format_dtb.c
+++ b/src/barebox-state/backend_format_dtb.c
@@ -1,18 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2012-2014 Pengutronix, Jan Luebbe <j.luebbe@pengutronix.de>
* Copyright (C) 2013-2014 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
* Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <mkl@pengutronix.de>
* Copyright (C) 2016 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
- *
- * This program is free software; 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.
- *
- * 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>
diff --git a/src/barebox-state/backend_format_raw.c b/src/barebox-state/backend_format_raw.c
index 5a71149d3443..16815155d00d 100644
--- a/src/barebox-state/backend_format_raw.c
+++ b/src/barebox-state/backend_format_raw.c
@@ -1,18 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2012-2014 Pengutronix, Jan Luebbe <j.luebbe@pengutronix.de>
* Copyright (C) 2013-2014 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
* Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <mkl@pengutronix.de>
* Copyright (C) 2016 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
- *
- * This program is free software; 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.
- *
- * 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>
diff --git a/src/barebox-state/backend_storage.c b/src/barebox-state/backend_storage.c
index 509427f16f1d..11e9b9036546 100644
--- a/src/barebox-state/backend_storage.c
+++ b/src/barebox-state/backend_storage.c
@@ -1,15 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2016 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
- *
- * This program is free software; 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.
- *
- * 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 <asm-generic/ioctl.h>
diff --git a/src/crypto/digest.c b/src/crypto/digest.c
index dc73ede9834d..b90ae675ab14 100644
--- a/src/crypto/digest.c
+++ b/src/crypto/digest.c
@@ -1,16 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* (C) Copyright 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * 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; version 2 of
- * the License.
- *
- * 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>
diff --git a/src/crypto/hmac.c b/src/crypto/hmac.c
index ab1b24d09c6b..c4429fb37988 100644
--- a/src/crypto/hmac.c
+++ b/src/crypto/hmac.c
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* (C) Copyright 2015 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * GPL v2 only
*/
#include <common.h>
diff --git a/src/crypto/internal.h b/src/crypto/internal.h
index 06254ea7d94f..bf44146bbb46 100644
--- a/src/crypto/internal.h
+++ b/src/crypto/internal.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* (C) Copyright 2015 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * GPL v2 only
*/
int digest_generic_verify(struct digest *d, const unsigned char *md);
diff --git a/src/crypto/keystore.h b/src/crypto/keystore.h
index 2cedd73934db..53cd535d00b2 100644
--- a/src/crypto/keystore.h
+++ b/src/crypto/keystore.h
@@ -1,16 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* (C) Copyright 2015 Pengutronix, Marc Kleine-Budde <kernel@pengutronix.de>
- *
- * 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; version 2 of
- * the License.
- *
- * 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.
- *
*/
#ifndef __KEYSTORE_H
diff --git a/src/digest.h b/src/digest.h
index 9764e57e43e9..a36af1955079 100644
--- a/src/digest.h
+++ b/src/digest.h
@@ -1,16 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* (C) Copyright 2008-2010 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
- *
- * 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; version 2 of
- * the License.
- *
- * 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.
- *
*/
#ifndef __DIGEST_H__
diff --git a/src/dtblint-imx-pinmux.c b/src/dtblint-imx-pinmux.c
index 83bfd90c2d75..4a08e86ed229 100644
--- a/src/dtblint-imx-pinmux.c
+++ b/src/dtblint-imx-pinmux.c
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2015 Pengutronix, Uwe Kleine-König <kernel@pengutronix.de>
- *
- * This program is free software; 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.
*/
#include <inttypes.h>
#include <stdlib.h>
diff --git a/src/dtblint.c b/src/dtblint.c
index ed9f0b292315..5799b33fa770 100644
--- a/src/dtblint.c
+++ b/src/dtblint.c
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2016 Pengutronix, Uwe Kleine-König <kernel@pengutronix.de>
- *
- * This program is free software; 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.
*/
#include <stdlib.h>
#include <stdint.h>
diff --git a/src/fdt.c b/src/fdt.c
index 74d2825d945f..a136112d51e3 100644
--- a/src/fdt.c
+++ b/src/fdt.c
@@ -1,18 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* dtb.c - flat devicetree functions
*
* Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
*
* based on Linux devicetree support
- *
- * This program is free software; 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.
- *
- * 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 <stdio.h>
diff --git a/src/keystore-blob.c b/src/keystore-blob.c
index ed6ecb4eaa25..9df11f06ecc2 100644
--- a/src/keystore-blob.c
+++ b/src/keystore-blob.c
@@ -1,9 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <kernel@pengutronix.de>
- *
- * This program is free software; 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.
*/
#include <common.h>
diff --git a/src/libdt.c b/src/libdt.c
index 59e76d336d8d..c16f5796613b 100644
--- a/src/libdt.c
+++ b/src/libdt.c
@@ -1,18 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* of.c - basic devicetree functions
*
* Copyright (c) 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
*
* based on Linux devicetree support
- *
- * This program is free software; 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.
- *
- * 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 <stdio.h>
#include <linux/types.h>
--
2.29.2
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread* [OSS-Tools] [PATCH dt-utils 3/4] treewide: add SPDX identifier to files with Zlib license
2021-03-26 21:06 [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
2021-03-26 21:06 ` [OSS-Tools] [PATCH dt-utils 2/4] treewide: add SPDX identifiers to files with GPL-2.0-only license Roland Hieber
@ 2021-03-26 21:06 ` Roland Hieber
2021-03-30 12:55 ` Uwe Kleine-König
2021-03-26 21:06 ` [OSS-Tools] [PATCH dt-utils 4/4] treewide: add SPDX identifiers to files without license Roland Hieber
` (3 subsequent siblings)
5 siblings, 1 reply; 19+ messages in thread
From: Roland Hieber @ 2021-03-26 21:06 UTC (permalink / raw)
To: oss-tools; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
src/crc32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/crc32.c b/src/crc32.c
index 8d4dddcf6129..6d534c996050 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: Zlib */
/*
* This file is derived from crc32.c from the zlib-1.1.3 distribution
* by Jean-loup Gailly and Mark Adler.
@@ -5,7 +6,6 @@
/* crc32.c -- compute the CRC-32 of a data stream
* Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
*/
#include <stdint.h>
--
2.29.2
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OSS-Tools] [PATCH dt-utils 3/4] treewide: add SPDX identifier to files with Zlib license
2021-03-26 21:06 ` [OSS-Tools] [PATCH dt-utils 3/4] treewide: add SPDX identifier to files with Zlib license Roland Hieber
@ 2021-03-30 12:55 ` Uwe Kleine-König
0 siblings, 0 replies; 19+ messages in thread
From: Uwe Kleine-König @ 2021-03-30 12:55 UTC (permalink / raw)
To: Roland Hieber; +Cc: oss-tools
[-- Attachment #1.1: Type: text/plain, Size: 1686 bytes --]
On Fri, Mar 26, 2021 at 10:06:46PM +0100, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> src/crc32.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/crc32.c b/src/crc32.c
> index 8d4dddcf6129..6d534c996050 100644
> --- a/src/crc32.c
> +++ b/src/crc32.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: Zlib */
> /*
> * This file is derived from crc32.c from the zlib-1.1.3 distribution
> * by Jean-loup Gailly and Mark Adler.
> @@ -5,7 +6,6 @@
>
> /* crc32.c -- compute the CRC-32 of a data stream
> * Copyright (C) 1995-1998 Mark Adler
> - * For conditions of distribution and use, see copyright notice in zlib.h
> */
Interesting hunk separation. I wonder if this is worth to be reported
to the git list because
diff --git a/src/crc32.c b/src/crc32.c
index 8d4dddcf6129..6d534c996050 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -1,11 +1,11 @@
+/* SPDX-License-Identifier: Zlib */
/*
* This file is derived from crc32.c from the zlib-1.1.3 distribution
* by Jean-loup Gailly and Mark Adler.
*/
/* crc32.c -- compute the CRC-32 of a data stream
* Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
*/
#include <stdint.h>
should be equivalent and isn't any longer. Or is it only me who
considers this obviously better?
Other than that:
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 96 bytes --]
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* [OSS-Tools] [PATCH dt-utils 4/4] treewide: add SPDX identifiers to files without license
2021-03-26 21:06 [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
2021-03-26 21:06 ` [OSS-Tools] [PATCH dt-utils 2/4] treewide: add SPDX identifiers to files with GPL-2.0-only license Roland Hieber
2021-03-26 21:06 ` [OSS-Tools] [PATCH dt-utils 3/4] treewide: add SPDX identifier to files with Zlib license Roland Hieber
@ 2021-03-26 21:06 ` Roland Hieber
2021-03-30 11:08 ` [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
` (2 subsequent siblings)
5 siblings, 0 replies; 19+ messages in thread
From: Roland Hieber @ 2021-03-26 21:06 UTC (permalink / raw)
To: oss-tools; +Cc: Roland Hieber
The project license has been GPL-2.0-only since commit
2b39a389428224d96bbb (2014-11-27, Sascha Hauer: "COPYING: Change to
GPLv2"). Reflect this in the file headers.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
Makefile.am | 2 ++
NEWS | 2 ++
README | 2 ++
autogen.sh | 1 +
configure.ac | 2 ++
scripts/barebox-mark-successful-boot.sh | 1 +
src/barebox-state.h | 2 ++
src/barebox-state/state.h | 2 ++
src/base64.h | 2 ++
src/crypto/sha.h | 1 +
src/dt/common.h | 2 ++
src/dt/dt.h | 2 ++
src/dt/fdt.h | 2 ++
src/dt/list.h | 2 ++
src/dtblint.h | 1 +
src/fdt.h | 2 ++
src/fdtdump.c | 2 ++
src/fs.h | 2 ++
src/libbb.h | 2 ++
src/linux/list.h | 1 +
src/linux/mtd/mtd-abi.h | 1 +
src/of.h | 1 +
src/printk.h | 1 +
src/state.h | 1 +
24 files changed, 39 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index d3077317ce9a..960ac4902af5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
EXTRA_DIST = DCO
CLEANFILES =
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
diff --git a/NEWS b/NEWS
index e27f5efe20ac..fa169f9498d6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
dt-utils 2021.03.0
==================
diff --git a/README b/README
index 20c9e3484ed2..c56f4c549d0a 100644
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
Utilities to work with device trees in Linux userspace
The following tools are available:
diff --git a/autogen.sh b/autogen.sh
index 0d60b0a96e9a..0c0353a20edd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,5 @@
#!/bin/sh -e
+# SPDX-License-Identifier: GPL-2.0-only
if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
diff --git a/configure.ac b/configure.ac
index 16cbbd075321..87668587ad40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
AC_PREREQ(2.60)
AC_INIT([dt-utils],
[2021.03.0],
diff --git a/scripts/barebox-mark-successful-boot.sh b/scripts/barebox-mark-successful-boot.sh
index 3120f57450fa..8aecabfc1912 100644
--- a/scripts/barebox-mark-successful-boot.sh
+++ b/scripts/barebox-mark-successful-boot.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-only
DEFAULT_REMAINING_ATTEMPTS=3
DEFAULT_PRIORITY=20
diff --git a/src/barebox-state.h b/src/barebox-state.h
index a0f49a549649..d007fc4ea191 100644
--- a/src/barebox-state.h
+++ b/src/barebox-state.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef __BAREBOX_STATE__
#define __BAREBOX_STATE__
diff --git a/src/barebox-state/state.h b/src/barebox-state/state.h
index 912d6d484823..47d8442f184e 100644
--- a/src/barebox-state/state.h
+++ b/src/barebox-state/state.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#include <linux/types.h>
#include <linux/list.h>
#include <driver.h>
diff --git a/src/base64.h b/src/base64.h
index 6ce0885822da..e0bbe4baa819 100644
--- a/src/base64.h
+++ b/src/base64.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef __BASE64_H
#define __BASE64_H
diff --git a/src/crypto/sha.h b/src/crypto/sha.h
index 190f8a0e0242..355bb76171c8 100644
--- a/src/crypto/sha.h
+++ b/src/crypto/sha.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Common values for SHA algorithms
*/
diff --git a/src/dt/common.h b/src/dt/common.h
index c3c4f53fc216..3efe43b5cd5a 100644
--- a/src/dt/common.h
+++ b/src/dt/common.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef __DT_COMMON_H
#define __DT_COMMON_H
diff --git a/src/dt/dt.h b/src/dt/dt.h
index 4ae24ba8bf7a..2fbb4e0f8059 100644
--- a/src/dt/dt.h
+++ b/src/dt/dt.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef __DT_DT_H
#define __DT_DT_H
diff --git a/src/dt/fdt.h b/src/dt/fdt.h
index 35278e30304b..cfa153077a32 100644
--- a/src/dt/fdt.h
+++ b/src/dt/fdt.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef _FDT_H
#define _FDT_H
diff --git a/src/dt/list.h b/src/dt/list.h
index c17b5d4b9ba1..87c5e1cb3a23 100644
--- a/src/dt/list.h
+++ b/src/dt/list.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef _LINUX_LIST_H
#define _LINUX_LIST_H
diff --git a/src/dtblint.h b/src/dtblint.h
index 4efd5865a988..896bfe8ba9f5 100644
--- a/src/dtblint.h
+++ b/src/dtblint.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
void dtblint_imx_pinmux(void);
diff --git a/src/fdt.h b/src/fdt.h
index 261743394803..95c15f37ea05 100644
--- a/src/fdt.h
+++ b/src/fdt.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef _FDT_H
#define _FDT_H
diff --git a/src/fdtdump.c b/src/fdtdump.c
index 1b609da0719a..e9323c8f4d80 100644
--- a/src/fdtdump.c
+++ b/src/fdtdump.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/src/fs.h b/src/fs.h
index 8b05b1aaf1ba..3f8be4aad216 100644
--- a/src/fs.h
+++ b/src/fs.h
@@ -1 +1,3 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#include <sys/mman.h>
diff --git a/src/libbb.h b/src/libbb.h
index 9f9d32d12d94..0a88f68121e0 100644
--- a/src/libbb.h
+++ b/src/libbb.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
#ifndef __LIBBB_H
#define __LIBBB_H
diff --git a/src/linux/list.h b/src/linux/list.h
index 83c6d7534446..5bcf36d9a5a3 100644
--- a/src/linux/list.h
+++ b/src/linux/list.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
#include <dt/list.h>
diff --git a/src/linux/mtd/mtd-abi.h b/src/linux/mtd/mtd-abi.h
index bd0de7680856..848d61cda4fe 100644
--- a/src/linux/mtd/mtd-abi.h
+++ b/src/linux/mtd/mtd-abi.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
#include <mtd/mtd-abi.h>
diff --git a/src/of.h b/src/of.h
index 4cbf197439ca..7e3a447081a5 100644
--- a/src/of.h
+++ b/src/of.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __OF_H
#define __OF_H
diff --git a/src/printk.h b/src/printk.h
index a0adcaaed223..f0fcbd6d8c57 100644
--- a/src/printk.h
+++ b/src/printk.h
@@ -1 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
#include <dt/common.h>
diff --git a/src/state.h b/src/state.h
index d98b781c2089..be1b592576c1 100644
--- a/src/state.h
+++ b/src/state.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef __STATE_H
#define __STATE_H
--
2.29.2
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-26 21:06 [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
` (2 preceding siblings ...)
2021-03-26 21:06 ` [OSS-Tools] [PATCH dt-utils 4/4] treewide: add SPDX identifiers to files without license Roland Hieber
@ 2021-03-30 11:08 ` Roland Hieber
2021-03-30 11:22 ` Ahmad Fatoum
2021-03-30 12:49 ` Uwe Kleine-König
2023-08-01 10:10 ` Roland Hieber
5 siblings, 1 reply; 19+ messages in thread
From: Roland Hieber @ 2021-03-30 11:08 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: oss-tools
Uwe, could I get a Reviewed-by from you for these four patches? :-)
- Roland
On Fri, Mar 26, 2021 at 10:06:44PM +0100, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> sizes.h | 12 +-----------
> src/barebox-state/state.c | 11 +----------
> src/barebox-state/state_variables.c | 11 +----------
> src/base64.c | 3 +--
> src/crypto/sha1.c | 7 +------
> src/crypto/sha2.c | 7 +------
> 6 files changed, 6 insertions(+), 45 deletions(-)
>
> diff --git a/sizes.h b/sizes.h
> index 6f91e9b4bd23..a73bb87e4b5b 100644
> --- a/sizes.h
> +++ b/sizes.h
> @@ -1,14 +1,4 @@
> -/*
> - * 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.
> - */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /* Size defintions
> * Copyright (C) ARM Limited 1998. All rights reserved.
> */
> diff --git a/src/barebox-state/state.c b/src/barebox-state/state.c
> index f528b3e19f21..e3825d6aeab2 100644
> --- a/src/barebox-state/state.c
> +++ b/src/barebox-state/state.c
> @@ -1,17 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * Copyright (C) 2012-2014 Pengutronix, Jan Luebbe <j.luebbe@pengutronix.de>
> * Copyright (C) 2013-2014 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
> * Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <mkl@pengutronix.de>
> - *
> - * 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.
> */
>
> #include <asm-generic/ioctl.h>
> diff --git a/src/barebox-state/state_variables.c b/src/barebox-state/state_variables.c
> index 16f630f57f9f..429f1f0a3479 100644
> --- a/src/barebox-state/state_variables.c
> +++ b/src/barebox-state/state_variables.c
> @@ -1,17 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * Copyright (C) 2012-2014 Pengutronix, Jan Luebbe <j.luebbe@pengutronix.de>
> * Copyright (C) 2013-2014 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
> * Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <mkl@pengutronix.de>
> - *
> - * 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.
> */
>
> #include <linux/err.h>
> diff --git a/src/base64.c b/src/base64.c
> index 6c02174d6377..5c7f9e884965 100644
> --- a/src/base64.c
> +++ b/src/base64.c
> @@ -1,11 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * Code based on busybox-1.23.2
> *
> * Copyright 2003, Glenn McGrath
> * Copyright 2006, Rob Landley <rob@landley.net>
> * Copyright 2010, Denys Vlasenko
> - *
> - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
> */
>
> #include <common.h>
> diff --git a/src/crypto/sha1.c b/src/crypto/sha1.c
> index cbde4d28e475..a66f4f2505d2 100644
> --- a/src/crypto/sha1.c
> +++ b/src/crypto/sha1.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * Cryptographic API.
> *
> @@ -9,12 +10,6 @@
> * Copyright (c) Alan Smithee.
> * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
> * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
> - *
> - * 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.
> - *
> */
>
> #include <common.h>
> diff --git a/src/crypto/sha2.c b/src/crypto/sha2.c
> index cb0f11c77ea0..4b3da0c9d230 100644
> --- a/src/crypto/sha2.c
> +++ b/src/crypto/sha2.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * Cryptographic API.
> *
> @@ -10,12 +11,6 @@
> * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
> * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
> * SHA224 Support Copyright 2007 Intel Corporation <jonathan.lynch@intel.com>
> - *
> - * 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.
> - *
> */
>
> #include <common.h>
> --
> 2.29.2
>
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-30 11:08 ` [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
@ 2021-03-30 11:22 ` Ahmad Fatoum
2021-03-30 13:30 ` Uwe Kleine-König
0 siblings, 1 reply; 19+ messages in thread
From: Ahmad Fatoum @ 2021-03-30 11:22 UTC (permalink / raw)
To: Roland Hieber, Uwe Kleine-König; +Cc: oss-tools
Hello Roland,
On 30.03.21 13:08, Roland Hieber wrote:
> Uwe, could I get a Reviewed-by from you for these four patches? :-)
We must still carry the full license texts in the project (cf. Linux
LICENSES/). This is missing here, no?
Cheers,
Ahmad
>
> - Roland
>
> On Fri, Mar 26, 2021 at 10:06:44PM +0100, Roland Hieber wrote:
>> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
>> ---
>> sizes.h | 12 +-----------
>> src/barebox-state/state.c | 11 +----------
>> src/barebox-state/state_variables.c | 11 +----------
>> src/base64.c | 3 +--
>> src/crypto/sha1.c | 7 +------
>> src/crypto/sha2.c | 7 +------
>> 6 files changed, 6 insertions(+), 45 deletions(-)
>>
>> diff --git a/sizes.h b/sizes.h
>> index 6f91e9b4bd23..a73bb87e4b5b 100644
>> --- a/sizes.h
>> +++ b/sizes.h
>> @@ -1,14 +1,4 @@
>> -/*
>> - * 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.
>> - */
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> /* Size defintions
>> * Copyright (C) ARM Limited 1998. All rights reserved.
>> */
>> diff --git a/src/barebox-state/state.c b/src/barebox-state/state.c
>> index f528b3e19f21..e3825d6aeab2 100644
>> --- a/src/barebox-state/state.c
>> +++ b/src/barebox-state/state.c
>> @@ -1,17 +1,8 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> /*
>> * Copyright (C) 2012-2014 Pengutronix, Jan Luebbe <j.luebbe@pengutronix.de>
>> * Copyright (C) 2013-2014 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
>> * Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <mkl@pengutronix.de>
>> - *
>> - * 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.
>> */
>>
>> #include <asm-generic/ioctl.h>
>> diff --git a/src/barebox-state/state_variables.c b/src/barebox-state/state_variables.c
>> index 16f630f57f9f..429f1f0a3479 100644
>> --- a/src/barebox-state/state_variables.c
>> +++ b/src/barebox-state/state_variables.c
>> @@ -1,17 +1,8 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> /*
>> * Copyright (C) 2012-2014 Pengutronix, Jan Luebbe <j.luebbe@pengutronix.de>
>> * Copyright (C) 2013-2014 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
>> * Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <mkl@pengutronix.de>
>> - *
>> - * 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.
>> */
>>
>> #include <linux/err.h>
>> diff --git a/src/base64.c b/src/base64.c
>> index 6c02174d6377..5c7f9e884965 100644
>> --- a/src/base64.c
>> +++ b/src/base64.c
>> @@ -1,11 +1,10 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> /*
>> * Code based on busybox-1.23.2
>> *
>> * Copyright 2003, Glenn McGrath
>> * Copyright 2006, Rob Landley <rob@landley.net>
>> * Copyright 2010, Denys Vlasenko
>> - *
>> - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
>> */
>>
>> #include <common.h>
>> diff --git a/src/crypto/sha1.c b/src/crypto/sha1.c
>> index cbde4d28e475..a66f4f2505d2 100644
>> --- a/src/crypto/sha1.c
>> +++ b/src/crypto/sha1.c
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> /*
>> * Cryptographic API.
>> *
>> @@ -9,12 +10,6 @@
>> * Copyright (c) Alan Smithee.
>> * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
>> * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
>> - *
>> - * 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.
>> - *
>> */
>>
>> #include <common.h>
>> diff --git a/src/crypto/sha2.c b/src/crypto/sha2.c
>> index cb0f11c77ea0..4b3da0c9d230 100644
>> --- a/src/crypto/sha2.c
>> +++ b/src/crypto/sha2.c
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>> /*
>> * Cryptographic API.
>> *
>> @@ -10,12 +11,6 @@
>> * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
>> * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
>> * SHA224 Support Copyright 2007 Intel Corporation <jonathan.lynch@intel.com>
>> - *
>> - * 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.
>> - *
>> */
>>
>> #include <common.h>
>> --
>> 2.29.2
>>
>>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-30 11:22 ` Ahmad Fatoum
@ 2021-03-30 13:30 ` Uwe Kleine-König
2021-03-30 13:50 ` Ahmad Fatoum
0 siblings, 1 reply; 19+ messages in thread
From: Uwe Kleine-König @ 2021-03-30 13:30 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: oss-tools, Roland Hieber
[-- Attachment #1.1: Type: text/plain, Size: 817 bytes --]
Hello,
On Tue, Mar 30, 2021 at 01:22:26PM +0200, Ahmad Fatoum wrote:
> On 30.03.21 13:08, Roland Hieber wrote:
> > Uwe, could I get a Reviewed-by from you for these four patches? :-)
>
> We must still carry the full license texts in the project (cf. Linux
> LICENSES/). This is missing here, no?
well, it depends on what you want to achieve. If you want to become SPDX
conformant this is indeed necessary. IMHO the conversion from several
different boilerplate license specifications to a single line is
beneficial even if the full licenses are not (yet) in the project.
So I don't regret having given my Review-tags.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 96 bytes --]
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-30 13:30 ` Uwe Kleine-König
@ 2021-03-30 13:50 ` Ahmad Fatoum
2021-03-30 14:00 ` Uwe Kleine-König
2021-03-30 15:53 ` Roland Hieber
0 siblings, 2 replies; 19+ messages in thread
From: Ahmad Fatoum @ 2021-03-30 13:50 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: oss-tools, Roland Hieber
Hello,
On 30.03.21 15:30, Uwe Kleine-König wrote:
> Hello,
>
> On Tue, Mar 30, 2021 at 01:22:26PM +0200, Ahmad Fatoum wrote:
>> On 30.03.21 13:08, Roland Hieber wrote:
>>> Uwe, could I get a Reviewed-by from you for these four patches? :-)
>>
>> We must still carry the full license texts in the project (cf. Linux
>> LICENSES/). This is missing here, no?
>
> well, it depends on what you want to achieve. If you want to become SPDX
> conformant this is indeed necessary. IMHO the conversion from several
> different boilerplate license specifications to a single line is
> beneficial even if the full licenses are not (yet) in the project.
If the code says that the license terms need to be distributed along
with the software, you are violating the license terms, if you don't
abide by this. This is unrelated to SPDX-Conformance.
> So I don't regret having given my Review-tags.
Reviewing is fine, but before applying license text removal, the full
license texts need to be located in full somewhere in the source tree.
Cheers,
Ahmad
>
> Best regards
> Uwe
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-30 13:50 ` Ahmad Fatoum
@ 2021-03-30 14:00 ` Uwe Kleine-König
2021-03-30 14:04 ` Ahmad Fatoum
2021-03-30 15:53 ` Roland Hieber
1 sibling, 1 reply; 19+ messages in thread
From: Uwe Kleine-König @ 2021-03-30 14:00 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: oss-tools, Roland Hieber
[-- Attachment #1.1: Type: text/plain, Size: 1222 bytes --]
Hi Ahmad,
On Tue, Mar 30, 2021 at 03:50:19PM +0200, Ahmad Fatoum wrote:
> On 30.03.21 15:30, Uwe Kleine-König wrote:
> > On Tue, Mar 30, 2021 at 01:22:26PM +0200, Ahmad Fatoum wrote:
> >> On 30.03.21 13:08, Roland Hieber wrote:
> >>> Uwe, could I get a Reviewed-by from you for these four patches? :-)
> >>
> >> We must still carry the full license texts in the project (cf. Linux
> >> LICENSES/). This is missing here, no?
> >
> > well, it depends on what you want to achieve. If you want to become SPDX
> > conformant this is indeed necessary. IMHO the conversion from several
> > different boilerplate license specifications to a single line is
> > beneficial even if the full licenses are not (yet) in the project.
>
> If the code says that the license terms need to be distributed along
> with the software, you are violating the license terms, if you don't
> abide by this. This is unrelated to SPDX-Conformance.
If distributing the full license text is required, this was a problem
already before, wasn't it?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 96 bytes --]
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-30 14:00 ` Uwe Kleine-König
@ 2021-03-30 14:04 ` Ahmad Fatoum
0 siblings, 0 replies; 19+ messages in thread
From: Ahmad Fatoum @ 2021-03-30 14:04 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: oss-tools, Roland Hieber
On 30.03.21 16:00, Uwe Kleine-König wrote:
> Hi Ahmad,
>
> On Tue, Mar 30, 2021 at 03:50:19PM +0200, Ahmad Fatoum wrote:
>> On 30.03.21 15:30, Uwe Kleine-König wrote:
>>> On Tue, Mar 30, 2021 at 01:22:26PM +0200, Ahmad Fatoum wrote:
>>>> On 30.03.21 13:08, Roland Hieber wrote:
>>>>> Uwe, could I get a Reviewed-by from you for these four patches? :-)
>>>>
>>>> We must still carry the full license texts in the project (cf. Linux
>>>> LICENSES/). This is missing here, no?
>>>
>>> well, it depends on what you want to achieve. If you want to become SPDX
>>> conformant this is indeed necessary. IMHO the conversion from several
>>> different boilerplate license specifications to a single line is
>>> beneficial even if the full licenses are not (yet) in the project.
>>
>> If the code says that the license terms need to be distributed along
>> with the software, you are violating the license terms, if you don't
>> abide by this. This is unrelated to SPDX-Conformance.
>
> If distributing the full license text is required, this was a problem
> already before, wasn't it?
Hmm, indeed. GPL-2.0 license text exists in COPYING. Zlib license text
doesn't exist in full.
>
> Best regards
> Uwe
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-30 13:50 ` Ahmad Fatoum
2021-03-30 14:00 ` Uwe Kleine-König
@ 2021-03-30 15:53 ` Roland Hieber
2021-03-30 17:31 ` Ahmad Fatoum
1 sibling, 1 reply; 19+ messages in thread
From: Roland Hieber @ 2021-03-30 15:53 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: oss-tools, Uwe Kleine-König
On Tue, Mar 30, 2021 at 03:50:19PM +0200, Ahmad Fatoum wrote:
> Hello,
>
> On 30.03.21 15:30, Uwe Kleine-König wrote:
> > Hello,
> >
> > On Tue, Mar 30, 2021 at 01:22:26PM +0200, Ahmad Fatoum wrote:
> >> On 30.03.21 13:08, Roland Hieber wrote:
> >>> Uwe, could I get a Reviewed-by from you for these four patches? :-)
> >>
> >> We must still carry the full license texts in the project (cf. Linux
> >> LICENSES/). This is missing here, no?
> >
> > well, it depends on what you want to achieve. If you want to become SPDX
> > conformant this is indeed necessary. IMHO the conversion from several
> > different boilerplate license specifications to a single line is
> > beneficial even if the full licenses are not (yet) in the project.
>
> If the code says that the license terms need to be distributed along
> with the software, you are violating the license terms, if you don't
> abide by this. This is unrelated to SPDX-Conformance.
Nothing in the license headers or in the GPL or in the Zlib license says
that we have to distribute the license text along with the source code.
On the contrary, there are even some versions of GPL license headers
that have a clause "if you didn't a license text along with the
software, write to the FSF at $ADDRESS".
But it is needed for REUSE [1] compliance, so I intend to move COPYING
into LICENSES/ nevertheless, and add the Zlib too. Thanks for catching
this.
[1]: https://reuse.software/
- Roland
> > So I don't regret having given my Review-tags.
>
> Reviewing is fine, but before applying license text removal, the full
> license texts need to be located in full somewhere in the source tree.
>
> Cheers,
> Ahmad
>
> >
> > Best regards
> > Uwe
> >
>
> --
> Pengutronix e.K. | |
> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-30 15:53 ` Roland Hieber
@ 2021-03-30 17:31 ` Ahmad Fatoum
2021-03-31 10:03 ` Roland Hieber
0 siblings, 1 reply; 19+ messages in thread
From: Ahmad Fatoum @ 2021-03-30 17:31 UTC (permalink / raw)
To: Roland Hieber; +Cc: oss-tools, Uwe Kleine-König
Hello Roland,
On 30.03.21 17:53, Roland Hieber wrote:
> On Tue, Mar 30, 2021 at 03:50:19PM +0200, Ahmad Fatoum wrote:
>> Hello,
>>
>> On 30.03.21 15:30, Uwe Kleine-König wrote:
>>> Hello,
>>>
>>> On Tue, Mar 30, 2021 at 01:22:26PM +0200, Ahmad Fatoum wrote:
>>>> On 30.03.21 13:08, Roland Hieber wrote:
>>>>> Uwe, could I get a Reviewed-by from you for these four patches? :-)
>>>>
>>>> We must still carry the full license texts in the project (cf. Linux
>>>> LICENSES/). This is missing here, no?
>>>
>>> well, it depends on what you want to achieve. If you want to become SPDX
>>> conformant this is indeed necessary. IMHO the conversion from several
>>> different boilerplate license specifications to a single line is
>>> beneficial even if the full licenses are not (yet) in the project.
>>
>> If the code says that the license terms need to be distributed along
>> with the software, you are violating the license terms, if you don't
>> abide by this. This is unrelated to SPDX-Conformance.
>
> Nothing in the license headers or in the GPL or in the Zlib license says
> that we have to distribute the license text along with the source code.
> On the contrary, there are even some versions of GPL license headers
> that have a clause "if you didn't a license text along with the
> software, write to the FSF at $ADDRESS".
If Zlib says "This notice may not be removed or altered from any
source distribution.", I interpret this as meaning that we need to ship
the full text as part of the source distribution and only a
SPDX-License-Identifier that can be looked up on a website somewhere doesn't
suffice.
> But it is needed for REUSE [1] compliance, so I intend to move COPYING
> into LICENSES/ nevertheless, and add the Zlib too. Thanks for catching
> this.
:)
Cheers,
Ahmad
>
> [1]: https://reuse.software/
>
> - Roland
>
>>> So I don't regret having given my Review-tags.
>>
>> Reviewing is fine, but before applying license text removal, the full
>> license texts need to be located in full somewhere in the source tree.
>>
>> Cheers,
>> Ahmad
>>
>>>
>>> Best regards
>>> Uwe
>>>
>>
>> --
>> Pengutronix e.K. | |
>> Steuerwalder Str. 21 | http://www.pengutronix.de/ |
>> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
>> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-30 17:31 ` Ahmad Fatoum
@ 2021-03-31 10:03 ` Roland Hieber
2021-03-31 10:10 ` Roland Hieber
0 siblings, 1 reply; 19+ messages in thread
From: Roland Hieber @ 2021-03-31 10:03 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: oss-tools, Uwe Kleine-König
On Tue, Mar 30, 2021 at 07:31:24PM +0200, Ahmad Fatoum wrote:
> Hello Roland,
>
> On 30.03.21 17:53, Roland Hieber wrote:
> > On Tue, Mar 30, 2021 at 03:50:19PM +0200, Ahmad Fatoum wrote:
> >> Hello,
> >>
> >> On 30.03.21 15:30, Uwe Kleine-König wrote:
> >>> Hello,
> >>>
> >>> On Tue, Mar 30, 2021 at 01:22:26PM +0200, Ahmad Fatoum wrote:
> >>>> On 30.03.21 13:08, Roland Hieber wrote:
> >>>>> Uwe, could I get a Reviewed-by from you for these four patches? :-)
> >>>>
> >>>> We must still carry the full license texts in the project (cf. Linux
> >>>> LICENSES/). This is missing here, no?
> >>>
> >>> well, it depends on what you want to achieve. If you want to become SPDX
> >>> conformant this is indeed necessary. IMHO the conversion from several
> >>> different boilerplate license specifications to a single line is
> >>> beneficial even if the full licenses are not (yet) in the project.
> >>
> >> If the code says that the license terms need to be distributed along
> >> with the software, you are violating the license terms, if you don't
> >> abide by this. This is unrelated to SPDX-Conformance.
> >
> > Nothing in the license headers or in the GPL or in the Zlib license says
> > that we have to distribute the license text along with the source code.
> > On the contrary, there are even some versions of GPL license headers
> > that have a clause "if you didn't a license text along with the
> > software, write to the FSF at $ADDRESS".
Apparently I was wrong about this, see GPL Clause 1.
> If Zlib says "This notice may not be removed or altered from any
> source distribution.", I interpret this as meaning that we need to ship
> the full text as part of the source distribution and only a
> SPDX-License-Identifier that can be looked up on a website somewhere doesn't
> suffice.
Yes. Hmm. GPL says a similar thing in Clause 1 ("keep intact all the
notices that refer to this License and to the absence of any warranty").
When thinking about it, I'd rather keep the original comment headers
intact and only add an SPDX license tag, and I don't understand why
these notices were removed in Linux when Linux moved to SPDX
identifiers. I also didn't find any reasoning on this.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-31 10:03 ` Roland Hieber
@ 2021-03-31 10:10 ` Roland Hieber
0 siblings, 0 replies; 19+ messages in thread
From: Roland Hieber @ 2021-03-31 10:10 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: oss-tools, Uwe Kleine-König
On Wed, Mar 31, 2021 at 12:03:05PM +0200, Roland Hieber wrote:
> On Tue, Mar 30, 2021 at 07:31:24PM +0200, Ahmad Fatoum wrote:
> > If Zlib says "This notice may not be removed or altered from any
> > source distribution.", I interpret this as meaning that we need to ship
> > the full text as part of the source distribution and only a
> > SPDX-License-Identifier that can be looked up on a website somewhere doesn't
> > suffice.
>
> Yes. Hmm. GPL says a similar thing in Clause 1 ("keep intact all the
> notices that refer to this License and to the absence of any warranty").
> When thinking about it, I'd rather keep the original comment headers
> intact and only add an SPDX license tag, and I don't understand why
> these notices were removed in Linux when Linux moved to SPDX
> identifiers. I also didn't find any reasoning on this.
Only this entry in the REUSE FAQ, which recommends to leave the
copyright notices intact.
https://reuse.software/faq/#edit-copyright-and-licensing
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-26 21:06 [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
` (3 preceding siblings ...)
2021-03-30 11:08 ` [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
@ 2021-03-30 12:49 ` Uwe Kleine-König
2023-08-01 10:10 ` Roland Hieber
5 siblings, 0 replies; 19+ messages in thread
From: Uwe Kleine-König @ 2021-03-30 12:49 UTC (permalink / raw)
To: Roland Hieber; +Cc: oss-tools
[-- Attachment #1.1: Type: text/plain, Size: 342 bytes --]
On Fri, Mar 26, 2021 at 10:06:44PM +0100, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 96 bytes --]
_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2021-03-26 21:06 [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license Roland Hieber
` (4 preceding siblings ...)
2021-03-30 12:49 ` Uwe Kleine-König
@ 2023-08-01 10:10 ` Roland Hieber
2023-08-01 10:12 ` Roland Hieber
5 siblings, 1 reply; 19+ messages in thread
From: Roland Hieber @ 2023-08-01 10:10 UTC (permalink / raw)
To: oss-tools, Roland Hieber
On Fri, 26 Mar 2021 22:06:44 +0100, Roland Hieber wrote:
>
Applied, thanks!
[1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
commit: c1880166d1e34efcf606297c8189b228aa78f78a
[2/4] treewide: add SPDX identifiers to files with GPL-2.0-only license
commit: 893c6c9f628fed614537fd548b7a851d2d9ee868
[3/4] treewide: add SPDX identifier to files with Zlib license
(no commit info)
[4/4] treewide: add SPDX identifiers to files without license
(no commit info)
Best regards,
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
2023-08-01 10:10 ` Roland Hieber
@ 2023-08-01 10:12 ` Roland Hieber
0 siblings, 0 replies; 19+ messages in thread
From: Roland Hieber @ 2023-08-01 10:12 UTC (permalink / raw)
To: oss-tools
On Tue, Aug 01, 2023 at 12:10:18PM +0200, Roland Hieber wrote:
>
> On Fri, 26 Mar 2021 22:06:44 +0100, Roland Hieber wrote:
> >
>
>
> Applied, thanks!
>
> [1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license
> commit: c1880166d1e34efcf606297c8189b228aa78f78a
> [2/4] treewide: add SPDX identifiers to files with GPL-2.0-only license
> commit: 893c6c9f628fed614537fd548b7a851d2d9ee868
> [3/4] treewide: add SPDX identifier to files with Zlib license
> (no commit info)
> [4/4] treewide: add SPDX identifiers to files without license
> (no commit info)
Oops. Seems like the "Auto-Thankanator gun" of 'b4 ty' misfired here…
Sorry for the noise.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 19+ messages in thread