From: Daan De Meyer Date: Mon, 15 Jul 2024 10:48:24 +0000 (+0200) Subject: Use the same SPDX license identifier everywhere X-Git-Tag: v24~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2ce68bdbba2566712c123697b1532b03b3e2541;p=thirdparty%2Fmkosi.git Use the same SPDX license identifier everywhere --- diff --git a/bin/mkosi b/bin/mkosi index 8a9c3a954..a7ab30618 100755 --- a/bin/mkosi +++ b/bin/mkosi @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later set -e PYTHONPATH="$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" export PYTHONPATH diff --git a/kernel-install/50-mkosi.install b/kernel-install/50-mkosi.install index b0922512e..cd7674f80 100644 --- a/kernel-install/50-mkosi.install +++ b/kernel-install/50-mkosi.install @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import argparse import dataclasses diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 77791c9ed..18d5091ef 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import contextlib import dataclasses diff --git a/mkosi/__main__.py b/mkosi/__main__.py index e9b3c8390..7b57fdc3a 100644 --- a/mkosi/__main__.py +++ b/mkosi/__main__.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later # PYTHON_ARGCOMPLETE_OK import faulthandler diff --git a/mkosi/archive.py b/mkosi/archive.py index 8adbc6afb..6a9324a61 100644 --- a/mkosi/archive.py +++ b/mkosi/archive.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import os from collections.abc import Iterable, Sequence diff --git a/mkosi/burn.py b/mkosi/burn.py index 7a57a7248..d75002ea8 100644 --- a/mkosi/burn.py +++ b/mkosi/burn.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import os import sys diff --git a/mkosi/config.py b/mkosi/config.py index d8a860b39..ae66728cb 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import argparse import base64 diff --git a/mkosi/context.py b/mkosi/context.py index 920271487..2a4102084 100644 --- a/mkosi/context.py +++ b/mkosi/context.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Sequence from contextlib import AbstractContextManager diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py index a0b853225..3ed1389a3 100644 --- a/mkosi/distributions/__init__.py +++ b/mkosi/distributions/__init__.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import enum import importlib diff --git a/mkosi/distributions/alma.py b/mkosi/distributions/alma.py index d2577d084..ac6285cac 100644 --- a/mkosi/distributions/alma.py +++ b/mkosi/distributions/alma.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from mkosi.context import Context from mkosi.distributions import centos, join_mirror diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py index 21a3e2c27..a33564755 100644 --- a/mkosi/distributions/arch.py +++ b/mkosi/distributions/arch.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Iterable, Sequence diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py index 60a5be001..e6cd985de 100644 --- a/mkosi/distributions/centos.py +++ b/mkosi/distributions/centos.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Iterable, Sequence diff --git a/mkosi/distributions/custom.py b/mkosi/distributions/custom.py index 6661fe9a5..38f10fba8 100644 --- a/mkosi/distributions/custom.py +++ b/mkosi/distributions/custom.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Sequence diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py index aa51a3668..0bfca9967 100644 --- a/mkosi/distributions/debian.py +++ b/mkosi/distributions/debian.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import tempfile from collections.abc import Iterable, Sequence diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py index d7a9fa4ee..7a5f3de49 100644 --- a/mkosi/distributions/fedora.py +++ b/mkosi/distributions/fedora.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import re from collections.abc import Iterable, Sequence diff --git a/mkosi/distributions/mageia.py b/mkosi/distributions/mageia.py index c72eac202..8ffb869af 100644 --- a/mkosi/distributions/mageia.py +++ b/mkosi/distributions/mageia.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Iterable diff --git a/mkosi/distributions/openmandriva.py b/mkosi/distributions/openmandriva.py index 47e7497fd..35224e187 100644 --- a/mkosi/distributions/openmandriva.py +++ b/mkosi/distributions/openmandriva.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Iterable diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py index 3b5522b70..bf1d33adf 100644 --- a/mkosi/distributions/opensuse.py +++ b/mkosi/distributions/opensuse.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import tempfile from collections.abc import Iterable, Sequence diff --git a/mkosi/distributions/rhel.py b/mkosi/distributions/rhel.py index 35de9e4bf..a70875199 100644 --- a/mkosi/distributions/rhel.py +++ b/mkosi/distributions/rhel.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Iterable from pathlib import Path diff --git a/mkosi/distributions/rhel_ubi.py b/mkosi/distributions/rhel_ubi.py index e486a0049..78bfc233b 100644 --- a/mkosi/distributions/rhel_ubi.py +++ b/mkosi/distributions/rhel_ubi.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Iterable diff --git a/mkosi/distributions/rocky.py b/mkosi/distributions/rocky.py index 7e33d1242..af2c4d186 100644 --- a/mkosi/distributions/rocky.py +++ b/mkosi/distributions/rocky.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from mkosi.context import Context from mkosi.distributions import centos, join_mirror diff --git a/mkosi/distributions/ubuntu.py b/mkosi/distributions/ubuntu.py index 5d9516f58..06d40cad2 100644 --- a/mkosi/distributions/ubuntu.py +++ b/mkosi/distributions/ubuntu.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Iterable from pathlib import Path diff --git a/mkosi/initrd/__main__.py b/mkosi/initrd/__main__.py index acb85e622..904083ba1 100644 --- a/mkosi/initrd/__main__.py +++ b/mkosi/initrd/__main__.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import argparse import os diff --git a/mkosi/installer/__init__.py b/mkosi/installer/__init__.py index 94eaf920d..bc535028b 100644 --- a/mkosi/installer/__init__.py +++ b/mkosi/installer/__init__.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from pathlib import Path diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py index df0f4def4..789194d16 100644 --- a/mkosi/installer/apt.py +++ b/mkosi/installer/apt.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import dataclasses import os diff --git a/mkosi/installer/dnf.py b/mkosi/installer/dnf.py index 84807114f..39bc01073 100644 --- a/mkosi/installer/dnf.py +++ b/mkosi/installer/dnf.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import os import textwrap from collections.abc import Iterable, Sequence diff --git a/mkosi/installer/pacman.py b/mkosi/installer/pacman.py index b5ff4c52d..300b289e3 100644 --- a/mkosi/installer/pacman.py +++ b/mkosi/installer/pacman.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import dataclasses import os diff --git a/mkosi/installer/rpm.py b/mkosi/installer/rpm.py index 8dcdf96b8..94d07697a 100644 --- a/mkosi/installer/rpm.py +++ b/mkosi/installer/rpm.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import dataclasses import subprocess diff --git a/mkosi/installer/zypper.py b/mkosi/installer/zypper.py index b8c1f9d5c..6c33ed2a8 100644 --- a/mkosi/installer/zypper.py +++ b/mkosi/installer/zypper.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import hashlib import os import textwrap diff --git a/mkosi/kmod.py b/mkosi/kmod.py index 9f80ba0f3..c64c55c35 100644 --- a/mkosi/kmod.py +++ b/mkosi/kmod.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import itertools import logging diff --git a/mkosi/log.py b/mkosi/log.py index 458d43511..e3612707c 100644 --- a/mkosi/log.py +++ b/mkosi/log.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import contextlib import contextvars diff --git a/mkosi/manifest.py b/mkosi/manifest.py index 29b72b9ea..c08acf6e3 100644 --- a/mkosi/manifest.py +++ b/mkosi/manifest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import dataclasses import datetime diff --git a/mkosi/mounts.py b/mkosi/mounts.py index 8f75f1a5e..ed7cec49f 100644 --- a/mkosi/mounts.py +++ b/mkosi/mounts.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import contextlib import os diff --git a/mkosi/pager.py b/mkosi/pager.py index 8ae064d5b..7077fb0a4 100644 --- a/mkosi/pager.py +++ b/mkosi/pager.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import os import pydoc diff --git a/mkosi/qemu.py b/mkosi/qemu.py index 1c146fd33..91f370da6 100644 --- a/mkosi/qemu.py +++ b/mkosi/qemu.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import asyncio import base64 diff --git a/mkosi/run.py b/mkosi/run.py index 9d865ba7a..da331abd4 100644 --- a/mkosi/run.py +++ b/mkosi/run.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import asyncio import asyncio.tasks diff --git a/mkosi/sandbox.py b/mkosi/sandbox.py index d5c624d4c..459199fb4 100644 --- a/mkosi/sandbox.py +++ b/mkosi/sandbox.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import contextlib import dataclasses import enum diff --git a/mkosi/tree.py b/mkosi/tree.py index 94adc66c3..82154d8aa 100644 --- a/mkosi/tree.py +++ b/mkosi/tree.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import contextlib import errno diff --git a/mkosi/types.py b/mkosi/types.py index c6621855c..aa7b7b8fb 100644 --- a/mkosi/types.py +++ b/mkosi/types.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import subprocess from pathlib import Path diff --git a/mkosi/user.py b/mkosi/user.py index 89bfaff3a..4a0ec8339 100644 --- a/mkosi/user.py +++ b/mkosi/user.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import ctypes import ctypes.util import fcntl diff --git a/mkosi/util.py b/mkosi/util.py index 637b918b5..da9b1140c 100644 --- a/mkosi/util.py +++ b/mkosi/util.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import ast import contextlib diff --git a/mkosi/versioncomp.py b/mkosi/versioncomp.py index 85da28147..56da1ad2f 100644 --- a/mkosi/versioncomp.py +++ b/mkosi/versioncomp.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import functools import itertools diff --git a/mkosi/vmspawn.py b/mkosi/vmspawn.py index bf42a8bdd..61b9295c9 100644 --- a/mkosi/vmspawn.py +++ b/mkosi/vmspawn.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import contextlib import os diff --git a/tests/__init__.py b/tests/__init__.py index 8b897c0fa..c1488cca6 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import contextlib import dataclasses diff --git a/tests/conftest.py b/tests/conftest.py index 7adb005f8..46843e951 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from collections.abc import Iterator from typing import Any, cast diff --git a/tests/test_boot.py b/tests/test_boot.py index 491011d16..3e4517831 100644 --- a/tests/test_boot.py +++ b/tests/test_boot.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import os import subprocess diff --git a/tests/test_config.py b/tests/test_config.py index 17926cf6f..692c6cccb 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import argparse import itertools diff --git a/tests/test_initrd.py b/tests/test_initrd.py index c9de76b13..c1751b472 100644 --- a/tests/test_initrd.py +++ b/tests/test_initrd.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import contextlib import os diff --git a/tests/test_json.py b/tests/test_json.py index 5f5f7d55f..43a51f1ab 100644 --- a/tests/test_json.py +++ b/tests/test_json.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import os import textwrap diff --git a/tests/test_sysext.py b/tests/test_sysext.py index d606cfb61..df33bd6ab 100644 --- a/tests/test_sysext.py +++ b/tests/test_sysext.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later from pathlib import Path diff --git a/tests/test_versioncomp.py b/tests/test_versioncomp.py index 265e60ce9..6743f8fc9 100644 --- a/tests/test_versioncomp.py +++ b/tests/test_versioncomp.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import itertools import pytest diff --git a/tools/do-a-release.sh b/tools/do-a-release.sh index b4436d3c9..fcba7f66a 100755 --- a/tools/do-a-release.sh +++ b/tools/do-a-release.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later if [ -z "$1" ] ; then echo "Version number not specified." diff --git a/tools/make-man-page.sh b/tools/make-man-page.sh index 35321a930..f7b85f382 100755 --- a/tools/make-man-page.sh +++ b/tools/make-man-page.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later set -ex pandoc -t man -s -o mkosi/resources/mkosi.1 mkosi/resources/mkosi.md