diff --git a/custom_baud.c b/custom_baud.c index 8bbe6cc74..a66eef523 100644 --- a/custom_baud.c +++ b/custom_baud.c @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2017 Urja Rannikko - * - * 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: 2017 Urja Rannikko */ #include diff --git a/custom_baud_darwin.c b/custom_baud_darwin.c index e8764ddf5..32390a2a3 100644 --- a/custom_baud_darwin.c +++ b/custom_baud_darwin.c @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2022 Peter Stuge - * - * 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: 2022 Peter Stuge */ #include diff --git a/custom_baud_linux.c b/custom_baud_linux.c index 761d49611..de23f65e9 100644 --- a/custom_baud_linux.c +++ b/custom_baud_linux.c @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2017 Urja Rannikko - * - * 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: 2017 Urja Rannikko */ #include diff --git a/doc/release_notes/devel.rst b/doc/release_notes/devel.rst index f0fe3c8f5..2be50f214 100644 --- a/doc/release_notes/devel.rst +++ b/doc/release_notes/devel.rst @@ -79,3 +79,18 @@ It need to be called prior to any other API calls that require flash context. The issue was a good motivation to write a new test which is built and runs as an external client of libflashrom. The test runs in a separate test executable to achieve this. As a bonus, test code in ``tests/external_client.c`` is an example how to use libflashrom API. + +SPDX tags for license and copyright +=================================== + +From now on, flashrom is using SPDX tags in source files to indicate license and copyright information. + +Specifically ``SPDX-License-Identifier`` tag is used for license info, and +``SPDX-FileCopyrightText`` tag is used for copyright info. + +Existing source files in the tree have been converted to use SPDX tags. New files should be +created with SPDX tags. For examples, look at any source file in the tree. + +Note that source files in directory ``subprojects/packagefiles/cmocka-1.1.5`` haven't been changed, +and won't be. Those files are unpacked from cmocka wrap, so that's the exact copy from another project, +and should stay as is. diff --git a/hwaccess_physmap.c b/hwaccess_physmap.c index f95b5f647..c3c73a763 100644 --- a/hwaccess_physmap.c +++ b/hwaccess_physmap.c @@ -1,19 +1,11 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2009 Peter Stuge - * Copyright (C) 2009 coresystems GmbH - * Copyright (C) 2010 Carl-Daniel Hailfinger - * Copyright (C) 2010 Rudolf Marek - * - * 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; version 2 of the License. - * - * 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-only + * SPDX-FileCopyrightText: 2009 Peter Stuge + * SPDX-FileCopyrightText: 2009 coresystems GmbH + * SPDX-FileCopyrightText: 2010 Carl-Daniel Hailfinger + * SPDX-FileCopyrightText: 2010 Rudolf Marek */ #include diff --git a/hwaccess_x86_io.c b/hwaccess_x86_io.c index 70b743959..e481d300a 100644 --- a/hwaccess_x86_io.c +++ b/hwaccess_x86_io.c @@ -1,19 +1,9 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2009,2010 Carl-Daniel Hailfinger - * Copyright (C) 2022 secunet Security Networks AG - * (Written by Thomas Heijligen - * Copyright (C) 2009 coresystems GmbH - * Copyright (C) 2010 Carl-Daniel Hailfinger - * Copyright (C) 2010 Rudolf Marek - * - * 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; version 2 of the License. - * - * 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-only + * SPDX-FileCopyrightText: 2009 Peter Stuge + * SPDX-FileCopyrightText: 2009 coresystems GmbH + * SPDX-FileCopyrightText: 2010 Carl-Daniel Hailfinger + * SPDX-FileCopyrightText: 2010 Rudolf Marek */ /* MSR abstraction implementations for Linux, OpenBSD, FreeBSD/Dragonfly, OSX, libpayload diff --git a/i2c_helper_linux.c b/i2c_helper_linux.c index 19b4404fb..0eda074b8 100644 --- a/i2c_helper_linux.c +++ b/i2c_helper_linux.c @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2020 The Chromium OS Authors - * - * 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: 2020 The Chromium OS Authors */ #include diff --git a/include/custom_baud.h b/include/custom_baud.h index 38e6cfc40..f16cf0bfe 100644 --- a/include/custom_baud.h +++ b/include/custom_baud.h @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2017 Urja Rannikko - * - * 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: 2017 Urja Rannikko */ #ifndef __CUSTOM_BAUD_H__ diff --git a/include/i2c_helper.h b/include/i2c_helper.h index b840b3a9d..e961ca930 100644 --- a/include/i2c_helper.h +++ b/include/i2c_helper.h @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2020 The Chromium OS Authors - * - * 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: 2020 The Chromium OS Authors */ #ifndef I2C_HELPER_H diff --git a/include/usb_device.h b/include/usb_device.h index ed8187bb3..4611a2c54 100644 --- a/include/usb_device.h +++ b/include/usb_device.h @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2020, Google Inc. All rights reserved. - * - * 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: 2020, Google Inc. All rights reserved. */ #ifndef USB_DEVICE_H diff --git a/include/usbdev.h b/include/usbdev.h index 3bd64b397..3f509533c 100644 --- a/include/usbdev.h +++ b/include/usbdev.h @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 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 __USBDEV_H__ diff --git a/serial.c b/serial.c index 06f8b5119..925b7427e 100644 --- a/serial.c +++ b/serial.c @@ -1,18 +1,9 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2009 Urja Rannikko - * Copyright (C) 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: 2009 Urja Rannikko + * SPDX-FileCopyrightText: 2009,2010 Carl-Daniel Hailfinger */ #include "serial.h" diff --git a/usb_device.c b/usb_device.c index 0c8e3e215..f1dbb08f8 100644 --- a/usb_device.c +++ b/usb_device.c @@ -1,17 +1,8 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2020, Google Inc. All rights reserved. - * - * 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: 2020, Google Inc. All rights reserved. */ #include "programmer.h" diff --git a/usbdev.c b/usbdev.c index 02627d8d2..ca8a2074e 100644 --- a/usbdev.c +++ b/usbdev.c @@ -1,18 +1,9 @@ /* * This file is part of the flashrom project. * - * Copyright (C) 2016 secunet Security Networks AG - * Copyright (C) 2018 Linaro Limited - * - * 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: 2016 secunet Security Networks AG + * SPDX-FileCopyrightText: 2018 Linaro Limited */