From 690ec44e0bbd624bf5cb2a7205c0273847207526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20V=C3=A1zquez=20Blanco?= Date: Sat, 9 Nov 2024 11:44:22 +0100 Subject: [PATCH] cli: Use SPDX in headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie523cf5b26a29de8e9e9efb56efe04a5ff86a59c Signed-off-by: Antonio Vázquez Blanco Reviewed-on: https://review.coreboot.org/c/flashrom/+/85073 Reviewed-by: Anastasia Klimchuk Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- cli_classic.c | 19 +++++-------------- cli_common.c | 17 ++++------------- cli_getopt.c | 26 ++++---------------------- cli_output.c | 15 +++------------ include/cli_getopt.h | 10 +--------- include/cli_output.h | 13 ++----------- 6 files changed, 19 insertions(+), 81 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index 0f303c080..21a9424fd 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -1,20 +1,11 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2000 Silicon Integrated System Corporation - * Copyright (C) 2004 Tyan Corp - * Copyright (C) 2005-2008 coresystems GmbH - * Copyright (C) 2008,2009,2010 Carl-Daniel Hailfinger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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. + * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-FileCopyrightText: 2000 Silicon Integrated System Corporation + * SPDX-FileCopyrightText: 2004 Tyan Corp + * SPDX-FileCopyrightText: 2005-2008 coresystems GmbH + * SPDX-FileCopyrightText: 2008,2009,2010 Carl-Daniel Hailfinger */ #include diff --git a/cli_common.c b/cli_common.c index afcd1f34e..c0e5b79a2 100644 --- a/cli_common.c +++ b/cli_common.c @@ -1,19 +1,10 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2009 Uwe Hermann - * Copyright (C) 2009 Carl-Daniel Hailfinger - * Copyright (C) 2011-2014 Stefan Tauner - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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. + * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-FileCopyrightText: 2009 Uwe Hermann + * SPDX-FileCopyrightText: 2009 Carl-Daniel Hailfinger + * SPDX-FileCopyrightText: 2011-2014 Stefan Tauner */ #include diff --git a/cli_getopt.c b/cli_getopt.c index 2112b8a13..242752723 100644 --- a/cli_getopt.c +++ b/cli_getopt.c @@ -1,28 +1,10 @@ /* * This file is part of the flashrom project. - * It comes originally from the musl libc project and is licensed under the - * terms of the MIT license. + * It comes originally from the musl libc project. * - * Copyringht (C) 2023 Rich Felker and the musl authors - * Adjusted for flashrom by Thomas Heijligen - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * SPDX-License-Identifier: MIT + * SPDX-FileCopyrightText: 2023 Rich Felker and the musl authors + * SPDX-FileCopyrightText: Thomas Heijligen */ #include diff --git a/cli_output.c b/cli_output.c index 42608b3e3..ece5ea939 100644 --- a/cli_output.c +++ b/cli_output.c @@ -1,18 +1,9 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2009 Sean Nelson - * Copyright (C) 2011 Carl-Daniel Hailfinger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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. + * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-FileCopyrightText: 2009 Sean Nelson + * SPDX-FileCopyrightText: 2011 Carl-Daniel Hailfinger */ #include diff --git a/include/cli_getopt.h b/include/cli_getopt.h index 670bd2452..55f26c907 100644 --- a/include/cli_getopt.h +++ b/include/cli_getopt.h @@ -1,15 +1,7 @@ /* * This file is part of the flashrom project. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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. + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef __CLI_GETOPT_H__ diff --git a/include/cli_output.h b/include/cli_output.h index 1a6238257..7d758cce1 100644 --- a/include/cli_output.h +++ b/include/cli_output.h @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright 2024 Antonio Vázquez Blanco - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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. + * SPDX-License-Identifier: GPL-2.0-or-later + * SPDX-FileCopyrightText: 2024 Antonio Vázquez Blanco */ #ifndef __CLI_OUTPUT_H__