LU-6142 lnet: SPDX for lnet/util/lnetconfig/

Convert from verbose license text to SDPX.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Change-Id: I25c57a0db2554f551bda0b9b5f6c03893ff83646
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54172
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/utils/lnetconfig/Makefile.am b/lnet/utils/lnetconfig/Makefile.am
index 20e2a4e..87dd23d 100644 (file)
--- a/lnet/utils/lnetconfig/Makefile.am
+++ b/lnet/utils/lnetconfig/Makefile.am
@@ -1,29 +1,13 @@
-#
-# LGPL HEADER START
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of the
-# License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library. If not, see <http://www.gnu.org/licenses/>.
-#
-# LGPL HEADER END
+# SPDX-License-Identifier: LGPL-2.0
 
 #
 # Copyright (c) 2014, 2017, Intel Corporation.
 #
 
-# Author:
-#   Amir Shehata <amir.shehata@intel.com>
+#
+# This file is part of Lustre, http://www.lustre.org/
+#
+# Author: Amir Shehata <amir.shehata@intel.com>
 #
 
 lib_LTLIBRARIES = liblnetconfig.la

diff --git a/lnet/utils/lnetconfig/cyaml.c b/lnet/utils/lnetconfig/cyaml.c
index 6600337..a71f72c 100644 (file)
--- a/lnet/utils/lnetconfig/cyaml.c
+++ b/lnet/utils/lnetconfig/cyaml.c
@@ -1,30 +1,12 @@
+// SPDX-License-Identifier: LGPL-2.0
+
 /*
- * LGPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * LGPL HEADER END
- *
  * Copyright (c) 2014, 2017, Intel Corporation.
- *
- * Author:
- *   Amir Shehata <amir.shehata@intel.com>
  */
 
 /*
+ * This file is part of Lustre, http://www.lustre.org/
+ *
  *  The cYAML tree is constructed as an n-tree.
  *  root -> cmd 1
  *          ||
@@ -33,6 +15,8 @@
  *                             ||
  *                             \/
  *                           attr2.1 -> attr2.1.1 -> attr2.1.2
+ *
+ * Author: Amir Shehata <amir.shehata@intel.com>
  */
 
 #include <yaml.h>

diff --git a/lnet/utils/lnetconfig/cyaml.h b/lnet/utils/lnetconfig/cyaml.h
index a43fa5a..471c704 100644 (file)
--- a/lnet/utils/lnetconfig/cyaml.h
+++ b/lnet/utils/lnetconfig/cyaml.h
@@ -1,27 +1,13 @@
+// SPDX-License-Identifier: LGPL-2.0
+
 /*
- * LGPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * LGPL HEADER END
- *
  * Copyright (c) 2014, 2017, Intel Corporation.
+ */
+
+/*
+ * This file is part of Lustre, http://www.lustre.org/
  *
- * Author:
- *   Amir Shehata <amir.shehata@intel.com>
+ * Author: Amir Shehata <amir.shehata@intel.com>
  */
 
 #ifndef CYAML_H

diff --git a/lnet/utils/lnetconfig/liblnd.h b/lnet/utils/lnetconfig/liblnd.h
index 29592f8..8b6c28e 100644 (file)
--- a/lnet/utils/lnetconfig/liblnd.h
+++ b/lnet/utils/lnetconfig/liblnd.h
@@ -1,28 +1,15 @@
+// SPDX-License-Identifier: LGPL-2.0
+
 /*
- * LGPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * LGPL HEADER END
- *
  * Copyright (c) 2015, James Simmons <jsimmons@infradead.org>
  *
  * Copyright (c) 2016, 2017, Intel Corporation.
  */
 
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ */
+
 #ifndef LIB_LND_CONFIG_API_H
 #define LIB_LND_CONFIG_API_H
 

diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c
index f350e32..0dbb8d2 100644 (file)
--- a/lnet/utils/lnetconfig/liblnetconfig.c
+++ b/lnet/utils/lnetconfig/liblnetconfig.c
@@ -1,37 +1,22 @@
+// SPDX-License-Identifier: LGPL-2.0
+
 /*
- * LGPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * LGPL HEADER END
- *
  * Copyright (c) 2014, 2017, Intel Corporation.
- *
- * Author:
- *   Amir Shehata <amir.shehata@intel.com>
  */
 
 /*
+ * This file is part of Lustre, http://www.lustre.org/
+ *
  * There are two APIs:
  *  1. APIs that take the actual parameters expanded.  This is for other
  *  entities that would like to link against the library and call the APIs
  *  directly without having to form an intermediate representation.
  *  2. APIs that take a YAML file and parses out the information there and
  *  calls the APIs mentioned in 1
+ *
+ * Author: Amir Shehata <amir.shehata@intel.com>
  */
+
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>

diff --git a/lnet/utils/lnetconfig/liblnetconfig.h b/lnet/utils/lnetconfig/liblnetconfig.h
index 47d5903..65f5076 100644 (file)
--- a/lnet/utils/lnetconfig/liblnetconfig.h
+++ b/lnet/utils/lnetconfig/liblnetconfig.h
@@ -1,27 +1,13 @@
+// SPDX-License-Identifier: LGPL-2.0
+
 /*
- * LGPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * LGPL HEADER END
- *
  * Copyright (c) 2014, 2017, Intel Corporation.
+ */
+
+/*
+ * This file is part of Lustre, http://www.lustre.org/
  *
- * Author:
- *   Amir Shehata <amir.shehata@intel.com>
+ * Author: Amir Shehata <amir.shehata@intel.com>
  */
 
 #ifndef LIB_LNET_CONFIG_API_H

diff --git a/lnet/utils/lnetconfig/liblnetconfig_lnd.c b/lnet/utils/lnetconfig/liblnetconfig_lnd.c
index 80673d9..c9a7933 100644 (file)
--- a/lnet/utils/lnetconfig/liblnetconfig_lnd.c
+++ b/lnet/utils/lnetconfig/liblnetconfig_lnd.c
@@ -1,29 +1,15 @@
+// SPDX-License-Identifier: LGPL-2.0
+
 /*
- * LGPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * LGPL HEADER END
- *
  * Copyright (c) 2015, James Simmons
  *
  * Copyright (c) 2016, 2017, Intel Corporation.
+ */
+
+/*
+ * This file is part of Lustre, http://www.lustre.org/
  *
- * Author:
- *   James Simmons <jsimmons@infradead.org>
+ * Author: James Simmons <jsimmons@infradead.org>
  */
 
 #include <limits.h>

diff --git a/lnet/utils/lnetconfig/liblnetconfig_netlink.c b/lnet/utils/lnetconfig/liblnetconfig_netlink.c
index 1f40471..a79b55c 100644 (file)
--- a/lnet/utils/lnetconfig/liblnetconfig_netlink.c
+++ b/lnet/utils/lnetconfig/liblnetconfig_netlink.c
@@ -1,25 +1,13 @@
+// SPDX-License-Identifier: LGPL-2.0
+
 /*
- * LGPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public License
- * LGPL version 2.1 or (at your discretion) any later version.
- * LGPL version 2.1 accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl-2.1.html
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * LGPL HEADER END
+ * Copyright (c) 2021  UT-Battelle, LLC
  */
-/**
- * Netlink handling.
+
+/*
+ * This file is part of Lustre, http://www.lustre.org/
  *
- * Copyright (c) 2021  UT-Battelle, LLC
+ * Netlink handling.
  *
  * Author: James Simmons <jsimmons@infradead.org>
  */

diff --git a/lnet/utils/lnetconfig/liblnetconfig_udsp.c b/lnet/utils/lnetconfig/liblnetconfig_udsp.c
index a2fd249..d6b4a75 100644 (file)
--- a/lnet/utils/lnetconfig/liblnetconfig_udsp.c
+++ b/lnet/utils/lnetconfig/liblnetconfig_udsp.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  *
@@ -5,26 +7,13 @@
  *
  * Copyright (c) 2018-2020 Data Direct Networks.
  *
- *   This file is part of Lustre, https://wiki.whamcloud.com/
- *
- *   Portals is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Portals 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.
- *
- *   You should have received a copy of the GNU General Public License
- *   version 2 along with this program; If not, see
- *   http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Author: Sonia Sharma
+ * Copyright (c) 2020, Whamcloud.
  */
+
 /*
- * Copyright (c) 2020, Whamcloud.
+ * This file is part of Lustre, http://www.lustre.org/
  *
+ * Author: Sonia Sharma
  */
 
 #include <errno.h>