SPDX: Clarify the attribution for James's lib/ code

At the time, this was explicitly contributed under the Tiano license,
even though the original code[0] is LGPLv2.1.

[0]: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git

Signed-off-by: Peter Jones <pjones@redhat.com>

8 files changed, 8 insertions, 60 deletions

diff --git a/lib/configtable.c b/lib/configtable.c
index df047f0e..3d0e1a85 100644
--- a/lib/configtable.c
+++ b/lib/configtable.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Copyright 2013 <James.Bottomley@HansenPartnership.com>
  *
- * see COPYING file
- *
  * read some platform configuration tables
  */
 #include <efi.h>
diff --git a/lib/console.c b/lib/console.c
index c92d27f3..ecd5c0e0 100644
--- a/lib/console.c
+++ b/lib/console.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Copyright 2012 <James.Bottomley@HansenPartnership.com>
  * Copyright 2013 Red Hat Inc. <pjones@redhat.com>
- *
- * see COPYING file
  */
 #include <efi.h>
 #include <efilib.h>
diff --git a/lib/execute.c b/lib/execute.c
index 3aff28ad..40b4005a 100644
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -1,41 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Copyright 2012 <James.Bottomley@HansenPartnership.com>
- *
- * see COPYING file
- *
- * --
- *
- * generate_path is a cut and paste from
- *  
- *   git://github.com/mjg59/shim.git
- *
  * Code Copyright 2012 Red Hat, Inc <mjg@redhat.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
  */
 
 #include <efi.h>
diff --git a/lib/guid.c b/lib/guid.c
index 99ff400a..143e0bbd 100644
--- a/lib/guid.c
+++ b/lib/guid.c
@@ -1,8 +1,4 @@
-/*
- * Copyright 2012 <James.Bottomley@HansenPartnership.com>
- *
- * see COPYING file
- */
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include "shim.h"
 
diff --git a/lib/security_policy.c b/lib/security_policy.c
index b51bcf77..da3cdcd3 100644
--- a/lib/security_policy.c
+++ b/lib/security_policy.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Copyright 2012 <James.Bottomley@HansenPartnership.com>
  *
- * see COPYING file
- *
  * Install and remove a platform security2 override policy
  */
 
diff --git a/lib/shell.c b/lib/shell.c
index e46e7fd2..87f279d6 100644
--- a/lib/shell.c
+++ b/lib/shell.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Copyright 2012 <James.Bottomley@HansenPartnership.com>
  *
- * see COPYING file
- *
  * misc shell helper functions
  */
 #include <efi.h>
diff --git a/lib/simple_file.c b/lib/simple_file.c
index 6ad31b4d..384b20ec 100644
--- a/lib/simple_file.c
+++ b/lib/simple_file.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Copyright 2012 <James.Bottomley@HansenPartnership.com>
- *
- * see COPYING file
  */
 
 #include <efi.h>
diff --git a/lib/variables.c b/lib/variables.c
index 5d909184..444a6db8 100644
--- a/lib/variables.c
+++ b/lib/variables.c
@@ -1,22 +1,13 @@
+// SPDX-License-Identifier: BSD-2-Clause-Patent
 /*
  * Copyright 2012 <James.Bottomley@HansenPartnership.com>
  *
- * see COPYING file
- *
  * Portions of this file are a direct cut and paste from Tianocore
  * (http://tianocore.sf.net)
  *
  *  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
  *
  * Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
- * This program and the accompanying materials
- * are licensed and made available under the terms and conditions of the BSD License
- * which accompanies this distribution.  The full text of the license may be found
- * at
- * http://opensource.org/licenses/bsd-license.php
- *
- * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
  *
  */
 #include <efi.h>