diff mbox series

[v1,2/7] avb: move SPDX license itdentifiers to the first line

Message ID 20240206223153.3060433-3-igor.opaniuk@foundries.io
State Superseded
Delegated to: Mattijs Korpershoek
Headers show
Series AVB: cosmetic adjustments/improvements | expand

Commit Message

Igor Opaniuk Feb. 6, 2024, 10:31 p.m. UTC 
From: Igor Opaniuk <igor.opaniuk@gmail.com>

Move SPDX license identifiers to the first line, so it conforms
to license placement rule [1]:

Placement:
The SPDX license identifier in kernel files shall be added at the first
possible line in a file which can contain a comment.  For the majority
of files this is the first line, except for scripts which require the
'#!PATH_TO_INTERPRETER' in the first line.  For those scripts the SPDX
identifier goes into the second line.

[1] https://www.kernel.org/doc/Documentation/process/license-rules.rst

Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---

 cmd/avb.c                              | 4 +---
 common/avb_verify.c                    | 3 +--
 include/avb_verify.h                   | 4 +---
 test/py/tests/test_android/test_avb.py | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

Comments

Mattijs Korpershoek Feb. 8, 2024, 1:41 p.m. UTC | #1 
Hi Igor,

Thank you for the patch.

On mar., févr. 06, 2024 at 23:31, Igor Opaniuk <igor.opaniuk@foundries.io> wrote:

> From: Igor Opaniuk <igor.opaniuk@gmail.com>
>
> Move SPDX license identifiers to the first line, so it conforms
> to license placement rule [1]:
>
> Placement:
> The SPDX license identifier in kernel files shall be added at the first
> possible line in a file which can contain a comment.  For the majority
> of files this is the first line, except for scripts which require the
> '#!PATH_TO_INTERPRETER' in the first line.  For those scripts the SPDX
> identifier goes into the second line.
>
> [1] https://www.kernel.org/doc/Documentation/process/license-rules.rst
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

Nitpick in the title: itdentifiers -> identifiers.
If no other remarks in the series, will fix when applying.

> ---
>
>  cmd/avb.c                              | 4 +---
>  common/avb_verify.c                    | 3 +--
>  include/avb_verify.h                   | 4 +---
>  test/py/tests/test_android/test_avb.py | 3 +--
>  4 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/cmd/avb.c b/cmd/avb.c
> index 783f51b8169..ce8b63873f2 100644
> --- a/cmd/avb.c
> +++ b/cmd/avb.c
> @@ -1,8 +1,6 @@
> -
> +// SPDX-License-Identifier: GPL-2.0+
>  /*
>   * (C) Copyright 2018, Linaro Limited
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
>  #include <avb_verify.h>
> diff --git a/common/avb_verify.c b/common/avb_verify.c
> index 59f2c25e0de..938a5383b5d 100644
> --- a/common/avb_verify.c
> +++ b/common/avb_verify.c
> @@ -1,7 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
>  /*
>   * (C) Copyright 2018, Linaro Limited
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
>  #include <avb_verify.h>
> diff --git a/include/avb_verify.h b/include/avb_verify.h
> index 1e787ba6668..2fb850044d9 100644
> --- a/include/avb_verify.h
> +++ b/include/avb_verify.h
> @@ -1,8 +1,6 @@
> -
> +/* SPDX-License-Identifier: GPL-2.0+ */
>  /*
>   * (C) Copyright 2018, Linaro Limited
> - *
> - * SPDX-License-Identifier:	GPL-2.0+
>   */
>  
>  #ifndef	_AVB_VERIFY_H
> diff --git a/test/py/tests/test_android/test_avb.py b/test/py/tests/test_android/test_avb.py
> index 238b48c90fa..865efbca4de 100644
> --- a/test/py/tests/test_android/test_avb.py
> +++ b/test/py/tests/test_android/test_avb.py
> @@ -1,6 +1,5 @@
> -# Copyright (c) 2018, Linaro Limited
> -#
>  # SPDX-License-Identifier:  GPL-2.0+
> +# Copyright (c) 2018, Linaro Limited
>  #
>  # Android Verified Boot 2.0 Test
>  
> -- 
> 2.34.1
diff mbox series

Patch

diff --git a/cmd/avb.c b/cmd/avb.c
index 783f51b8169..ce8b63873f2 100644
--- a/cmd/avb.c
+++ b/cmd/avb.c
@@ -1,8 +1,6 @@ 
-
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2018, Linaro Limited
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <avb_verify.h>
diff --git a/common/avb_verify.c b/common/avb_verify.c
index 59f2c25e0de..938a5383b5d 100644
--- a/common/avb_verify.c
+++ b/common/avb_verify.c
@@ -1,7 +1,6 @@ 
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2018, Linaro Limited
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <avb_verify.h>
diff --git a/include/avb_verify.h b/include/avb_verify.h
index 1e787ba6668..2fb850044d9 100644
--- a/include/avb_verify.h
+++ b/include/avb_verify.h
@@ -1,8 +1,6 @@ 
-
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2018, Linaro Limited
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #ifndef	_AVB_VERIFY_H
diff --git a/test/py/tests/test_android/test_avb.py b/test/py/tests/test_android/test_avb.py
index 238b48c90fa..865efbca4de 100644
--- a/test/py/tests/test_android/test_avb.py
+++ b/test/py/tests/test_android/test_avb.py
@@ -1,6 +1,5 @@ 
-# Copyright (c) 2018, Linaro Limited
-#
 # SPDX-License-Identifier:  GPL-2.0+
+# Copyright (c) 2018, Linaro Limited
 #
 # Android Verified Boot 2.0 Test