From cc1642096e32f2f71a30ca6adc7fed882786966e Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 25 Sep 2023 02:19:30 +0100 Subject: Use SPDX license headers on all scripts This results in much cleaner copyright and license declarations. SPDX headers are legally recognised and make auditing easier. Also, remove descriptions of each script, from each script. Libreboot documentation at docs/maintain/ describes them. Signed-off-by: Leah Rowe --- checkgit | 2 +- checkversion | 18 ++---------------- include/blobutil.sh | 2 +- include/defconfig.sh | 2 +- include/err.sh | 2 +- include/export.sh | 2 +- lbmk | 26 +++++--------------------- script/build/boot/roms | 31 +++++-------------------------- script/build/boot/roms_helper | 29 ++++++----------------------- script/build/command/options | 3 +-- script/build/coreboot/utils | 20 ++------------------ script/build/fw/serprog | 20 ++------------------ script/build/grub/payload | 20 ++------------------ script/build/grub/utils | 22 +++------------------- script/build/release/roms | 20 ++------------------ script/build/release/src | 20 ++------------------ script/handle/make/config | 25 ++++--------------------- script/handle/make/file | 20 ++------------------ script/update/blobs/download | 3 +-- script/update/blobs/extract | 4 +--- script/update/blobs/inject | 3 +-- script/update/blobs/mrc | 22 ++++------------------ script/update/project/repo | 3 +-- script/update/project/trees | 25 ++++--------------------- 24 files changed, 55 insertions(+), 289 deletions(-) diff --git a/checkgit b/checkgit index ba8bfe70..a1f900c3 100755 --- a/checkgit +++ b/checkgit @@ -1,6 +1,6 @@ #!/usr/bin/env sh -# SPDX-FileCopyrightText: 2023 Leah Rowe # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2023 Leah Rowe . "include/err.sh" diff --git a/checkversion b/checkversion index 6ee683ee..28d8d77a 100755 --- a/checkversion +++ b/checkversion @@ -1,20 +1,6 @@ #!/usr/bin/env sh - -# Copyright (C) 2021 Leah Rowe -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2021 Leah Rowe [ "x${DEBUG+set}" = 'xset' ] && set -v set -u diff --git a/include/blobutil.sh b/include/blobutil.sh index 77a59b74..7af94ea2 100755 --- a/include/blobutil.sh +++ b/include/blobutil.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2023 Leah Rowe # SPDX-License-Identifier: GPL-3.0-only +# SPDX-FileCopyrightText: 2023 Leah Rowe agent="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" diff --git a/include/defconfig.sh b/include/defconfig.sh index f022937a..7b2e4c12 100755 --- a/include/defconfig.sh +++ b/include/defconfig.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2023 Leah Rowe # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2023 Leah Rowe check_defconfig() { diff --git a/include/err.sh b/include/err.sh index ea46ccb3..94d2e540 100755 --- a/include/err.sh +++ b/include/err.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2022, 2023 Leah Rowe # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2022, 2023 Leah Rowe err() { diff --git a/include/export.sh b/include/export.sh index 9e393485..ada84e92 100755 --- a/include/export.sh +++ b/include/export.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2023 Leah Rowe # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2023 Leah Rowe tmpdir="" tmpdir_was_set="y" diff --git a/lbmk b/lbmk index 75aaab5f..c8259318 100755 --- a/lbmk +++ b/lbmk @@ -1,25 +1,9 @@ #!/usr/bin/env sh - -# generic script for calling other scripts in lbmk -# -# Copyright (C) 2014,2015,2020,2021,2023 Leah Rowe -# Copyright (C) 2015 Patrick "P. J." McDermott -# Copyright (C) 2015, 2016 Klemens Nanni -# Copyright (C) 2022, Caleb La Grange -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2014,2015,2020,2021,2023 Leah Rowe +# SPDX-FileCopyrightText: 2015 Patrick "P. J." McDermott +# SPDX-FileCopyrightText: 2015, 2016 Klemens Nanni +# SPDX-FileCopyrightText: 2022, Caleb La Grange [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/build/boot/roms b/script/build/boot/roms index 52e7198c..a1fc5e0d 100755 --- a/script/build/boot/roms +++ b/script/build/boot/roms @@ -1,30 +1,9 @@ #!/usr/bin/env sh - -# -# helper script: build coreboot images with various payloads -# -# Copyright (C) 2014,2015,2016,2020,2021,2023 Leah Rowe -# -# Copyright (C) 2015 Klemens Nanni -# Copyright (C) 2022 Caleb La Grange -# Copyright (C) 2022 Ferass El Hafidi -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -# This script assumes that the working directory is the root -# of git or release archive +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2014,2015,2016,2020,2021,2023 Leah Rowe +# SPDX-FileCopyrightText: 2015 Klemens Nanni +# SPDX-FileCopyrightText: 2022 Caleb La Grange +# SPDX-FileCopyrightText: 2022 Ferass El Hafidi [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper index ff8772eb..eb6efdbd 100755 --- a/script/build/boot/roms_helper +++ b/script/build/boot/roms_helper @@ -1,27 +1,10 @@ #!/usr/bin/env sh - -# helper script: create ROM images for a given mainboard -# -# Copyright (C) 2020,2021,2023 Leah Rowe -# Copyright (C) 2021,2022 Ferass El Hafidi -# -# Copyright (C) 2022 Caleb La Grange -# Copyright (C) 2022 Alper Nebi Yasak -# Copyright (C) 2023 Riku Viitanen -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2020,2021,2023 Leah Rowe +# SPDX-FileCopyrightText: 2021,2022 Ferass El Hafidi +# SPDX-FileCopyrightText: 2022 Caleb La Grange +# SPDX-FileCopyrightText: 2022 Alper Nebi Yasak +# SPDX-FileCopyrightText: 2023 Riku Viitanen [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/build/command/options b/script/build/command/options index dd22078f..1757b0b4 100755 --- a/script/build/command/options +++ b/script/build/command/options @@ -1,7 +1,6 @@ #!/usr/bin/env sh - -# Copyright (c) 2023 Leah Rowe # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2023 Leah Rowe . "include/err.sh" diff --git a/script/build/coreboot/utils b/script/build/coreboot/utils index 803d27d4..04cbba54 100755 --- a/script/build/coreboot/utils +++ b/script/build/coreboot/utils @@ -1,22 +1,6 @@ #!/usr/bin/env sh - -# helper script: build various coreboot utilities -# -# Copyright (C) 2014-2016,2020,2021,2023 Leah Rowe -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2014-2016,2020,2021,2023 Leah Rowe [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/build/fw/serprog b/script/build/fw/serprog index 59089537..211948ac 100755 --- a/script/build/fw/serprog +++ b/script/build/fw/serprog @@ -1,22 +1,6 @@ #!/usr/bin/env sh - -# compile serprog firmware for rp2040 and stm32 boards -# -# Copyright (C) 2023 Riku Viitanen -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2023 Riku Viitanen [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/build/grub/payload b/script/build/grub/payload index 343e1b88..21a5aaeb 100755 --- a/script/build/grub/payload +++ b/script/build/grub/payload @@ -1,22 +1,6 @@ #!/usr/bin/env sh - -# generate GRUB ELF files (coreboot payload) and configuration files -# -# Copyright (C) 2014,2015,2020,2021,2023 Leah Rowe -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2014,2015,2020,2021,2023 Leah Rowe [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/build/grub/utils b/script/build/grub/utils index cb80d15d..5fb6a27c 100755 --- a/script/build/grub/utils +++ b/script/build/grub/utils @@ -1,23 +1,7 @@ #!/usr/bin/env sh - -# helper script: builds GRUB2 source code -# -# Copyright (C) 2014, 2015, 2020, 2023 Leah Rowe -# Copyright (C) 2015, 2016 Klemens Nanni -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2014, 2015, 2020, 2023 Leah Rowe +# SPDX-FileCopyrightText: 2015, 2016 Klemens Nanni [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/build/release/roms b/script/build/release/roms index 369d088d..e792268b 100755 --- a/script/build/release/roms +++ b/script/build/release/roms @@ -1,22 +1,6 @@ #!/usr/bin/env sh - -# helper script: generate release archive (ROM images) -# -# Copyright (C) 2020,2021,2022,2023 Leah Rowe -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2020,2021,2022,2023 Leah Rowe [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/build/release/src b/script/build/release/src index c6cd595d..a51f9d90 100755 --- a/script/build/release/src +++ b/script/build/release/src @@ -1,22 +1,6 @@ #!/usr/bin/env sh - -# helper script: generate release archive (source code) -# -# Copyright (C) 2020,2021,2023 Leah Rowe -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2020,2021,2023 Leah Rowe [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/handle/make/config b/script/handle/make/config index 19ecb56b..81169953 100755 --- a/script/handle/make/config +++ b/script/handle/make/config @@ -1,25 +1,8 @@ #!/usr/bin/env sh - -# helper script: build elf files on build systems that use defconfig/kconfig -# -# Copyright (C) 2022 Alper Nebi Yasak -# Copyright (C) 2022 Ferass El Hafidi -# Copyright (C) 2023 Leah Rowe -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# you could probably build *linux* with this script! +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2022 Alper Nebi Yasak +# SPDX-FileCopyrightText: 2022 Ferass El Hafidi +# SPDX-FileCopyrightText: 2023 Leah Rowe [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/handle/make/file b/script/handle/make/file index 985abf35..7401c41f 100755 --- a/script/handle/make/file +++ b/script/handle/make/file @@ -1,22 +1,6 @@ #!/usr/bin/env sh - -# helper script: build utils used by lbmk -# -# Copyright (C) 2023 Leah Rowe -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2023 Leah Rowe [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e diff --git a/script/update/blobs/download b/script/update/blobs/download index 71c0cdb6..d9a745d9 100755 --- a/script/update/blobs/download +++ b/script/update/blobs/download @@ -1,9 +1,8 @@ #!/usr/bin/env sh - +# SPDX-License-Identifier: GPL-3.0-only # SPDX-FileCopyrightText: 2022 Caleb La Grange # SPDX-FileCopyrightText: 2022 Ferass El Hafidi # SPDX-FileCopyrightText: 2023 Leah Rowe -# SPDX-License-Identifier: GPL-3.0-only . "include/err.sh" . "include/defconfig.sh" diff --git a/script/update/blobs/extract b/script/update/blobs/extract index 4404f9e2..8a78a20f 100755 --- a/script/update/blobs/extract +++ b/script/update/blobs/extract @@ -1,9 +1,7 @@ #!/usr/bin/env sh -# script to automate extracting blobs from an existing vendor bios - +# SPDX-License-Identifier: GPL-3.0-only # SPDX-FileCopyrightText: 2022 Caleb La Grange # SPDX-FileCopyrightText: 2023 Leah Rowe -# SPDX-License-Identifier: GPL-3.0-only . "include/err.sh" . "include/defconfig.sh" diff --git a/script/update/blobs/inject b/script/update/blobs/inject index b849f5c5..660815cc 100755 --- a/script/update/blobs/inject +++ b/script/update/blobs/inject @@ -1,9 +1,8 @@ #!/usr/bin/env sh - +# SPDX-License-Identifier: GPL-3.0-only # SPDX-FileCopyrightText: 2022 Caleb La Grange # SPDX-FileCopyrightText: 2022 Ferass El Hafidi # SPDX-FileCopyrightText: 2023 Leah Rowe -# SPDX-License-Identifier: GPL-3.0-only . "include/err.sh" . "include/defconfig.sh" diff --git a/script/update/blobs/mrc b/script/update/blobs/mrc index 7e44b634..4db603cd 100755 --- a/script/update/blobs/mrc +++ b/script/update/blobs/mrc @@ -1,19 +1,9 @@ #!/usr/bin/env sh +# SPDX-License-Identifier: GPL-2.0-only -# Download Intel MRC images -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# Forked from util/chromeos/crosfirmware.sh in coreboot cfc26ce278. Changes to +# it in this version are exclusively by Leah Rowe, copyright as of 2021 and +# 2023, on top of original coreboot copyright auditable in coreboot.git. [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e @@ -22,10 +12,6 @@ set -u -e export PATH="${PATH}:/sbin" -# This file is forked from util/chromeos/crosfirmware.sh in coreboot cfc26ce278 -# Changes to it in *this version* are copyright 2021 and 2023 Leah Rowe, under -# the same license as above. - # use updated manifest from wayback machine, when updating mrc.bin, # and update the other variables below accordingly. current manifest used: # https://web.archive.org/web/20210211071412/https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf diff --git a/script/update/project/repo b/script/update/project/repo index d951fb3b..20e8d905 100755 --- a/script/update/project/repo +++ b/script/update/project/repo @@ -1,9 +1,8 @@ #!/usr/bin/env sh - +# SPDX-License-Identifier: GPL-3.0-only # SPDX-FileCopyrightText: 2022 Caleb La Grange # SPDX-FileCopyrightText: 2022 Ferass El Hafidi # SPDX-FileCopyrightText: 2023 Leah Rowe -# SPDX-License-Identifier: GPL-3.0-only . "include/err.sh" diff --git a/script/update/project/trees b/script/update/project/trees index 0c4e9d58..c1470e59 100755 --- a/script/update/project/trees +++ b/script/update/project/trees @@ -1,25 +1,8 @@ #!/usr/bin/env sh - -# helper script: create code trees based on git revision, with patches -# (currently used for downloading coreboot, seabios and u-boot) -# -# Copyright (C) 2014-2016,2020,2021,2023 Leah Rowe -# Copyright (C) 2022 Alper Nebi Yasak -# Copyright (C) 2022 Ferass El Hafidi -# -# 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 3 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. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# +# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-FileCopyrightText: 2014-2016,2020,2021,2023 Leah Rowe +# SPDX-FileCopyrightText: 2022 Alper Nebi Yasak +# SPDX-FileCopyrightText: 2022 Ferass El Hafidi [ "x${DEBUG+set}" = 'xset' ] && set -v set -u -e -- cgit v1.2.1