canutils: migrate to SPDX identifier

Most tools used for compliance and SBOM generation use SPDX identifiers This change brings us a step closer to an easy SBOM generation. Signed-off-by: Alin Jerpelea <[email protected]>
apache · Dec 18, 2024 · 1d37300 · 1d37300
1 parent 87d7726
commit 1d37300
Show file tree

Hide file tree

Showing 47 changed files with 116 additions and 50 deletions.
diff --git a/canutils/CMakeLists.txt b/canutils/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/canutils/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this

diff --git a/canutils/Make.defs b/canutils/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/Makefile b/canutils/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/candump/CMakeLists.txt b/canutils/candump/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/canutils/candump/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this

diff --git a/canutils/candump/Make.defs b/canutils/candump/Make.defs
@@ -1,6 +1,7 @@
 ############################################################################
 # apps/canutils/candump/Make.defs
-# Adds selected applications to apps/ build
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

diff --git a/canutils/candump/Makefile b/canutils/candump/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/candump/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/candump/candump.c b/canutils/candump/candump.c
@@ -1,9 +1,8 @@
-/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
-/*
- * candump.c
+/****************************************************************************
+ * apps/canutils/candump/candump.c
  *
- * Copyright (c) 2002-2009 Volkswagen Group Electronic Research
- * All rights reserved.
+ * SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+ * SPDX-FileCopyrightText: 2002-2007 Volkswagen Group Electronic Research
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -40,7 +39,11 @@
  *
  * Send feedback to <[email protected]>
  *
- */
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -66,6 +69,10 @@
 #include "terminal.h"
 #include "lib.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
 /* for hardware timestamps - since Linux 2.6.30 */
 #ifndef SO_TIMESTAMPING
 #define SO_TIMESTAMPING 37
@@ -98,6 +105,10 @@
 const char col_on [MAXCOL][19] = {BLUE, RED, GREEN, BOLD, MAGENTA, CYAN};
 const char col_off [] = ATTRESET;
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
 static __u32 dropcnt[MAXSOCK];
 static __u32 last_dropcnt[MAXSOCK];
 static char devname[MAXIFNAMES][IFNAMSIZ+1];

diff --git a/canutils/canlib/CMakeLists.txt b/canutils/canlib/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/canutils/canlib/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this

diff --git a/canutils/canlib/Make.defs b/canutils/canlib/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/canlib/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/canlib/Makefile b/canutils/canlib/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/canlib/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/canlib/canlib_getbaud.c b/canutils/canlib/canlib_getbaud.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/canutils/canlib/canlib_getbaud.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

diff --git a/canutils/canlib/canlib_getloopback.c b/canutils/canlib/canlib_getloopback.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/canutils/canlib/canlib_getloopback.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

diff --git a/canutils/canlib/canlib_getsilent.c b/canutils/canlib/canlib_getsilent.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/canutils/canlib/canlib_getsilent.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

diff --git a/canutils/canlib/canlib_setbaud.c b/canutils/canlib/canlib_setbaud.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/canutils/canlib/canlib_setbaud.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

diff --git a/canutils/canlib/canlib_setloopback.c b/canutils/canlib/canlib_setloopback.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/canutils/canlib/canlib_setloopback.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

diff --git a/canutils/canlib/canlib_setsilent.c b/canutils/canlib/canlib_setsilent.c
@@ -1,6 +1,8 @@
 /****************************************************************************
  * apps/canutils/canlib/canlib_setsilent.c
  *
+ * SPDX-License-Identifier: Apache-2.0
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.  The

diff --git a/canutils/cansend/CMakeLists.txt b/canutils/cansend/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/canutils/cansend/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this

diff --git a/canutils/cansend/Make.defs b/canutils/cansend/Make.defs
@@ -1,6 +1,7 @@
 ############################################################################
 # apps/canutils/cansend/Make.defs
-# Adds selected applications to apps/ build
+#
+# SPDX-License-Identifier: Apache-2.0
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

diff --git a/canutils/cansend/Makefile b/canutils/cansend/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/cansend/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/cansend/cansend.c b/canutils/cansend/cansend.c
@@ -1,30 +1,8 @@
 /****************************************************************************
  * apps/canutils/cansend/cansend.c
  *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) *
- *
- * cansend.c - send CAN-frames via CAN_RAW sockets
- *
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
- * All rights reserved.
+ * SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+ * SPDX-FileCopyrightText: 2002-2007 Volkswagen Group Electronic Research
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/canutils/lely-canopen/CMakeLists.txt b/canutils/lely-canopen/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/canutils/lely-canopen/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this

diff --git a/canutils/lely-canopen/Make.defs b/canutils/lely-canopen/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/lely-canopen/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/lely-canopen/Makefile b/canutils/lely-canopen/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/lely-canopen/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/libcanutils/CMakeLists.txt b/canutils/libcanutils/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/canutils/libcanutils/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this

diff --git a/canutils/libcanutils/Make.defs b/canutils/libcanutils/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/libcanutils/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/libcanutils/Makefile b/canutils/libcanutils/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/libcanutils/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/libcanutils/lib.c b/canutils/libcanutils/lib.c
@@ -1,9 +1,7 @@
-/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
-/*
- * lib.c - library for command line tools
+/****************************************************************************
  *
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
- * All rights reserved.
+ * SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+ * SPDX-FileCopyrightText: 2002-2007 Volkswagen Group Electronic Research
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -40,7 +38,7 @@
  *
  * Send feedback to <[email protected]>
  *
- */
+ ****************************************************************************/
 
 #include <stdio.h>
 #include <string.h>

diff --git a/canutils/libcanutils/lib.h b/canutils/libcanutils/lib.h
@@ -1,9 +1,7 @@
-/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
-/*
- * lib.h - library include for command line tools
+/****************************************************************************
  *
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
- * All rights reserved.
+ * SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+ * SPDX-FileCopyrightText: 2002-2007 Volkswagen Group Electronic Research
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -40,7 +38,7 @@
  *
  * Send feedback to <[email protected]>
  *
- */
+ ****************************************************************************/
 
 #ifndef CAN_UTILS_LIB_H
 #define CAN_UTILS_LIB_H

diff --git a/canutils/libcanutils/terminal.h b/canutils/libcanutils/terminal.h
@@ -1,7 +1,7 @@
-/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
-/*
- * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
- * All rights reserved.
+/****************************************************************************
+ *
+ * SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+ * SPDX-FileCopyrightText: 2002-2007 Volkswagen Group Electronic Research
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -38,7 +38,7 @@
  *
  * Send feedback to <[email protected]>
  *
- */
+ ****************************************************************************/
 
 #ifndef TERMINAL_H
 #define TERMINAL_H

diff --git a/canutils/libdronecan/CMakeLists.txt b/canutils/libdronecan/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/canutils/libdronecan/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this

diff --git a/canutils/libdronecan/Make.defs b/canutils/libdronecan/Make.defs
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/libdronecan/Make.defs
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/libdronecan/Makefile b/canutils/libdronecan/Makefile
@@ -1,6 +1,8 @@
 ############################################################################
 # apps/canutils/libdronecan/Makefile
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The

diff --git a/canutils/libobd2/CMakeLists.txt b/canutils/libobd2/CMakeLists.txt
@@ -1,6 +1,8 @@
 # ##############################################################################
 # apps/canutils/libobd2/CMakeLists.txt
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements.  See the NOTICE file distributed with this work for
 # additional information regarding copyright ownership.  The ASF licenses this