libavb: Update SPDX tag style

Signed-off-by: Tom Rini <trini@konsulko.com>
2024-11-24 21:54:01 +00:00 · 2018-06-19 11:21:44 -04:00 · 2018-06-19 11:21:44 -04:00 · 897a1d947e
commit 897a1d947e
parent e3f7c4f851
36 changed files with 36 additions and 73 deletions
--- a/lib/libavb/Makefile
+++ b/lib/libavb/Makefile
@ -1,8 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # (C) Copyright 2017 Linaro Limited
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#

 obj-$(CONFIG_LIBAVB) += avb_chain_partition_descriptor.o avb_cmdline.o
 obj-$(CONFIG_LIBAVB) += avb_crypto.o avb_footer.o avb_hashtree_descriptor.o
--- a/lib/libavb/avb_chain_partition_descriptor.c
+++ b/lib/libavb/avb_chain_partition_descriptor.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_chain_partition_descriptor.h"
--- a/lib/libavb/avb_chain_partition_descriptor.h
+++ b/lib/libavb/avb_chain_partition_descriptor.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_cmdline.c
+++ b/lib/libavb/avb_cmdline.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_cmdline.h"
--- a/lib/libavb/avb_cmdline.h
+++ b/lib/libavb/avb_cmdline.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #ifdef AVB_INSIDE_LIBAVB_H
--- a/lib/libavb/avb_crypto.c
+++ b/lib/libavb/avb_crypto.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_crypto.h"
--- a/lib/libavb/avb_crypto.h
+++ b/lib/libavb/avb_crypto.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_descriptor.c
+++ b/lib/libavb/avb_descriptor.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_descriptor.h"
--- a/lib/libavb/avb_descriptor.h
+++ b/lib/libavb/avb_descriptor.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_footer.c
+++ b/lib/libavb/avb_footer.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_footer.h"
--- a/lib/libavb/avb_footer.h
+++ b/lib/libavb/avb_footer.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_hash_descriptor.c
+++ b/lib/libavb/avb_hash_descriptor.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_hash_descriptor.h"
--- a/lib/libavb/avb_hash_descriptor.h
+++ b/lib/libavb/avb_hash_descriptor.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_hashtree_descriptor.c
+++ b/lib/libavb/avb_hashtree_descriptor.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_hashtree_descriptor.h"
--- a/lib/libavb/avb_hashtree_descriptor.h
+++ b/lib/libavb/avb_hashtree_descriptor.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_kernel_cmdline_descriptor.c
+++ b/lib/libavb/avb_kernel_cmdline_descriptor.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_kernel_cmdline_descriptor.h"
--- a/lib/libavb/avb_kernel_cmdline_descriptor.h
+++ b/lib/libavb/avb_kernel_cmdline_descriptor.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_ops.h
+++ b/lib/libavb/avb_ops.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_property_descriptor.c
+++ b/lib/libavb/avb_property_descriptor.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_property_descriptor.h"
--- a/lib/libavb/avb_property_descriptor.h
+++ b/lib/libavb/avb_property_descriptor.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_rsa.c
+++ b/lib/libavb/avb_rsa.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT OR BSD-3-Clause
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	(MIT or BSD-3-Clause)
 */

 /* Implementation of RSA signature verification which uses a pre-processed
--- a/lib/libavb/avb_rsa.h
+++ b/lib/libavb/avb_rsa.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT OR BSD-3-Clause */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	(MIT or BSD-3-Clause)
 */

 /* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
--- a/lib/libavb/avb_sha.h
+++ b/lib/libavb/avb_sha.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #ifdef AVB_INSIDE_LIBAVB_H
--- a/lib/libavb/avb_sha256.c
+++ b/lib/libavb/avb_sha256.c
@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
 * Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
 * All rights reserved.
@ -5,8 +6,6 @@
 * FIPS 180-2 SHA-224/256/384/512 implementation
 * Last update: 02/02/2007
 * Issue date:  04/30/2005
- *
- * SPDX-License-Identifier:	BSD-3-Clause
 */

 #include "avb_sha.h"
--- a/lib/libavb/avb_sha512.c
+++ b/lib/libavb/avb_sha512.c
@ -1,3 +1,4 @@
+// SPDX-License-Identifier: BSD-3-Clause
 /*
 * Copyright (C) 2005, 2007 Olivier Gay <olivier.gay@a3.epfl.ch>
 * All rights reserved.
@ -5,8 +6,6 @@
 * FIPS 180-2 SHA-224/256/384/512 implementation
 * Last update: 02/02/2007
 * Issue date:  04/30/2005
- *
- * SPDX-License-Identifier:	BSD-3-Clause
 */

 #include "avb_sha.h"
--- a/lib/libavb/avb_slot_verify.c
+++ b/lib/libavb/avb_slot_verify.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_slot_verify.h"
--- a/lib/libavb/avb_slot_verify.h
+++ b/lib/libavb/avb_slot_verify.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_sysdeps.h
+++ b/lib/libavb/avb_sysdeps.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_sysdeps_posix.c
+++ b/lib/libavb/avb_sysdeps_posix.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include <stdarg.h>
--- a/lib/libavb/avb_util.c
+++ b/lib/libavb/avb_util.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_util.h"
--- a/lib/libavb/avb_util.h
+++ b/lib/libavb/avb_util.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_vbmeta_image.c
+++ b/lib/libavb/avb_vbmeta_image.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_vbmeta_image.h"
--- a/lib/libavb/avb_vbmeta_image.h
+++ b/lib/libavb/avb_vbmeta_image.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/avb_version.c
+++ b/lib/libavb/avb_version.c
@ -1,7 +1,6 @@
+// SPDX-License-Identifier: MIT
 /*
 * Copyright (C) 2017 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #include "avb_version.h"
--- a/lib/libavb/avb_version.h
+++ b/lib/libavb/avb_version.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2017 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #if !defined(AVB_INSIDE_LIBAVB_H) && !defined(AVB_COMPILATION)
--- a/lib/libavb/libavb.h
+++ b/lib/libavb/libavb.h
@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: MIT */
 /*
 * Copyright (C) 2016 The Android Open Source Project
- *
- * SPDX-License-Identifier:	MIT
 */

 #ifndef LIBAVB_H_