Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Makefile: Use SPDX identifier
Change-Id: Ia05f2ecd31d0606dfe2bca843dbe6df2b8212a27 Signed-off-by: Jacob Garber jgarber1@ualberta.ca --- M Makefile 1 file changed, 1 insertion(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/41598/1
diff --git a/Makefile b/Makefile index 470be94..a3dea58 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,4 @@ -## -## -## Copyright (C) 2008 Advanced Micro Devices, Inc. -## Copyright (C) 2008 Uwe Hermann uwe@hermann-uwe.de -## Copyright (C) 2009-2010 coresystems GmbH -## Copyright (C) 2011 secunet Security Networks AG -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## 1. Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## 2. 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. -## 3. The name of the author may not be used to endorse or promote products -## derived from this software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -## +# SPDX-License-Identifier: BSD-3-Clause
ifneq ($(words $(CURDIR)),1) $(error Error: Path to the main directory cannot contain spaces)
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 1: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 1:
(2 comments)
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile File Makefile:
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile@1 PS1, Line 1: # SPDX-License-Identifier: BSD-3-Clause Why only one `#` ?
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile@1 PS1, Line 1: BSD-3-Clause I think you have to retain the copyright notices: CB:41222
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Angel Pons, HAOUAS Elyes,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41598
to look at the new patch set (#2).
Change subject: Makefile: Use SPDX identifier ......................................................................
Makefile: Use SPDX identifier
Change-Id: Ia05f2ecd31d0606dfe2bca843dbe6df2b8212a27 Signed-off-by: Jacob Garber jgarber1@ualberta.ca --- M LICENSES/retained-copyrights.txt M Makefile 2 files changed, 4 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/41598/2
Jacob Garber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile File Makefile:
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile@1 PS1, Line 1: # SPDX-License-Identifier: BSD-3-Clause
Why only one `#` ?
That's what Makefile.inc uses and I just copied that. Is there a reason to prefer two?
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile@1 PS1, Line 1: BSD-3-Clause
I think you have to retain the copyright notices: CB:41222
Done
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 2: Code-Review+1
(1 comment)
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile File Makefile:
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile@1 PS1, Line 1: # SPDX-License-Identifier: BSD-3-Clause
That's what Makefile.inc uses and I just copied that. […]
well, C and Ada comments start with two characters, so I'd use two as well to be consistent
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Angel Pons, HAOUAS Elyes,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41598
to look at the new patch set (#3).
Change subject: Makefile: Use SPDX identifier ......................................................................
Makefile: Use SPDX identifier
Change-Id: Ia05f2ecd31d0606dfe2bca843dbe6df2b8212a27 Signed-off-by: Jacob Garber jgarber1@ualberta.ca --- M LICENSES/retained-copyrights.txt M Makefile 2 files changed, 4 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/41598/3
Jacob Garber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile File Makefile:
https://review.coreboot.org/c/coreboot/+/41598/1/Makefile@1 PS1, Line 1: # SPDX-License-Identifier: BSD-3-Clause
well, C and Ada comments start with two characters, so I'd use two as well to be consistent
Ack
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 3: Code-Review+2
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 3: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 3: Code-Review+2
Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Makefile: Use SPDX identifier
Change-Id: Ia05f2ecd31d0606dfe2bca843dbe6df2b8212a27 Signed-off-by: Jacob Garber jgarber1@ualberta.ca Reviewed-on: https://review.coreboot.org/c/coreboot/+/41598 Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Patrick Georgi pgeorgi@google.com Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M LICENSES/retained-copyrights.txt M Makefile 2 files changed, 4 insertions(+), 30 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved HAOUAS Elyes: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/LICENSES/retained-copyrights.txt b/LICENSES/retained-copyrights.txt index 6775d2e..671f37f 100644 --- a/LICENSES/retained-copyrights.txt +++ b/LICENSES/retained-copyrights.txt @@ -25,6 +25,8 @@ Copyright (C) 2008 Advanced Micro Devices, Inc. Copyright (c) 2008, Google Inc. Copyright (C) 2008 Jordan Crouse jordan@cosmicpenguin.net +Copyright (C) 2008 Uwe Hermann uwe@hermann-uwe.de +Copyright (C) 2009-2010 coresystems GmbH Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved. Copyright (c) 2010-2017, The Regents of the University of California Copyright (c) 2010, Code Aurora Forum. All rights reserved. @@ -36,6 +38,7 @@ Copyright (c) 2011 - 2014 The Linux Foundation. All rights reserved. Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. Copyright (c) 2011, Google Inc. +Copyright (C) 2011 secunet Security Networks AG Copyright (c) 2012 - 2013, 2015, 2019 The Linux Foundation. Copyright (c) 2012 - 2013, 2015 The Linux Foundation. All rights reserved. Copyright (c) 2012 - 2013 The Linux Foundation. All rights reserved. diff --git a/Makefile b/Makefile index 470be94..2bc2a6f 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,4 @@ -## -## -## Copyright (C) 2008 Advanced Micro Devices, Inc. -## Copyright (C) 2008 Uwe Hermann uwe@hermann-uwe.de -## Copyright (C) 2009-2010 coresystems GmbH -## Copyright (C) 2011 secunet Security Networks AG -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## 1. Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## 2. 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. -## 3. The name of the author may not be used to endorse or promote products -## derived from this software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -## +## SPDX-License-Identifier: BSD-3-Clause
ifneq ($(words $(CURDIR)),1) $(error Error: Path to the main directory cannot contain spaces)
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41598 )
Change subject: Makefile: Use SPDX identifier ......................................................................
Patch Set 4:
Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4 Emulation targets: "QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/3918 "QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/3917 "QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/3916 "QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/3915
Please note: This test is under development and might not be accurate at all!