Use the same SPDX license identifier everywhere

diff --git a/bin/mkosi b/bin/mkosi
index 8a9c3a954e4458af3e06a2a1ff1cf954f41f9a06..a7ab306186d9b2e40bacb8d64b88dd72d7a1777a 100755 (executable)
--- 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 b0922512e0b9e53df3efa33af8e67f9f1ba7c560..cd7674f807f3946b53dd7bd64cf3e8f16e1608d4 100644 (file)
--- 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 77791c9eda6918990250c5c5ce128607e40c3787..18d5091efeedaa5f22622e04a6155877bae2f8a6 100644 (file)
--- 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 e9b3c8390d8d5142825f6ce81259ec8c09e747db..7b57fdc3ad35e470daff85d935bdaee130495e7c 100644 (file)
--- 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 8adbc6afb28a4af73cfce6068a87dd2a40af6898..6a9324a61e4bbea2f5dc64e5ec020dba5321ec09 100644 (file)
--- 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 7a57a7248278063782b9c420edd7114872f89eb9..d75002ea85cb90307e0b408ad7271a04a36a6c46 100644 (file)
--- 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 d8a860b390764e9b3bcd230027b8adb6777f89ed..ae66728cbca66c5f7400d3ed974f9561ee9e1e12 100644 (file)
--- 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 920271487ba0dcff5036caf747da607ebe6f96c7..2a4102084a37c24d11fe723ccbeb221d308c435b 100644 (file)
--- 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 a0b8532254cf9b109d62414878614cb5f65a065a..3ed1389a3b524f208a077d60f0945f81cf0ff172 100644 (file)
--- 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 d2577d084063a00483d803648492055a24119416..ac6285cacc1a3f0bd6c92eacb6340163f5d68b97 100644 (file)
--- 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 21a3e2c273965edfbcce609bb2521c158b6cd6e5..a33564755b7ff0b1423ba991fb5ac7e3bed0d0fb 100644 (file)
--- 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 60a5be001c75b2a2a19a9e2955f0b8f9fa08dbb3..e6cd985de6b4e211f8a47527c61ffbd4654a994c 100644 (file)
--- 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 6661fe9a5a13c9380be6fde3f2ced901302d3abe..38f10fba8119fdd11eedb33c54d6be861e9bed8a 100644 (file)
--- 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 aa51a366852bf9ee7c48c26d6ae5c33448bf06a6..0bfca9967a515a4c85704cc0a8c2d12210e4e5d1 100644 (file)
--- 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 d7a9fa4ee34b8381e864eb9570850db68132fe04..7a5f3de498c5353f2e8a3ad092bbbf5daf60a8d5 100644 (file)
--- 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 c72eac2025c05859cd11731f4784f7b0da6812a6..8ffb869af80c876361a78891c43fb44b8adcb365 100644 (file)
--- 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 47e7497fd3a423b1b22ecd335f382b023113489e..35224e1876e9d69084031c1aead01d2246dd81a4 100644 (file)
--- 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 3b5522b706ebde17e4201d4520168ad9257087ad..bf1d33adffc20c00c730352a0804305facf58c8f 100644 (file)
--- 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 35de9e4bf7084a2c72830af79b8678c833ee03e3..a708751992bdf1b4fe78e09025a7987d81644a23 100644 (file)
--- 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 e486a0049698cad7af4d72a6d8e382683aae6551..78bfc233b8c77f3af4d97bc586801abadd198b34 100644 (file)
--- 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 7e33d12429bacf269d29a2e9e8a9104ec7caa277..af2c4d18629f451ca1ababaa13da86dc742590f1 100644 (file)
--- 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 5d9516f586f5dab3c00635c950d5963d494c5237..06d40cad21cb4337195cdab79e900d10686adaab 100644 (file)
--- 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 acb85e6228a62c2ffb7d958e5c6fcb8a4bbf9e67..904083ba1c77a8fc4365cd2b2058580a8a588a86 100644 (file)
--- 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 94eaf920d1526e4f560c11476644f9e55c13c92f..bc535028b5f885003aa4dfd0d2c4cd0ed8300a81 100644 (file)
--- 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 df0f4def44a8fce8a0611a8149594ea8e1b549e8..789194d168448ec297540eaa17505e95d78832cb 100644 (file)
--- 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 84807114f4e8466fe5a0cfb1bd39cfceaa39a17d..39bc01073dde8878220c35d781fa26a14212b477 100644 (file)
--- 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 b5ff4c52d773207ae6c02fd32446e152a8f56535..300b289e3289137222c910772fa62a278b1685d8 100644 (file)
--- 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 8dcdf96b856f4cb642a2b9e21731f1202ed89342..94d07697a033a15cd895269e14eb4727b0306ced 100644 (file)
--- 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 b8c1f9d5c4b4e620377fe10b55552682fd952d62..6c33ed2a82e697a49abb11fb8558ae8fd0634925 100644 (file)
--- 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 9f80ba0f34f53557571e808b3d1bc92428ff83c6..c64c55c355a7f432df7e3fc9d2a52b03be2d68d4 100644 (file)
--- 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 458d43511d796e77455968e408d9b7cb0ae4ec42..e3612707c62ad1124ff398f1174e39f69199238d 100644 (file)
--- 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 29b72b9ea8e41e5b4a2dd07e0a2a54b7dea7d80e..c08acf6e32543bd7825b1f27e22ece6d6bfb9715 100644 (file)
--- 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 8f75f1a5ec3e5386e17f7b442d68d996bbe9a964..ed7cec49f161891cbbcc81f1dd795e48bf40d183 100644 (file)
--- 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 8ae064d5b5ac5d65b3d6d45e4c3c83db7a719b57..7077fb0a4ccce3a299a07babedb5e8cc216f5e61 100644 (file)
--- 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 1c146fd336c10a0c86cfbc57340037558d4940c9..91f370da6852ac3016dd506f3b64690bca5fb2d6 100644 (file)
--- 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 9d865ba7a714956a98e42c3f0d7d34b11e492730..da331abd41acf928e1f376a85de4e65558885be0 100644 (file)
--- 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 d5c624d4c220c182571a47151fa740752420c757..459199fb48e35ac3a4cc2fe0f3924a28178557e8 100644 (file)
--- 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 94adc66c3e1522bc8f324294ecf879b38c628685..82154d8aace51c40553faee50aee96150cee3b91 100644 (file)
--- 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 c6621855c97ce83cbbebc8db4f62d21415f04c1e..aa7b7b8fb382925d5b79e0f42e6696460c9754b5 100644 (file)
--- 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 89bfaff3aa20f793fa183af9b500b7902c3dc497..4a0ec833973c176a82d2cd224ab76900fae38fe0 100644 (file)
--- 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 637b918b50714651c405f8fe756c8b3f8b07a6b9..da9b1140cd8a7c7163d1b298bb7b0ee57812f68e 100644 (file)
--- 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 85da281477b0a15c44fa32a9f8b6bf568fde2f48..56da1ad2fb90b9c97835779d1057f2d58e31f20f 100644 (file)
--- 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 bf42a8bdd8433985b0532c0f7716aa85fe768815..61b9295c9b33b1e04e5398d76fc5291701ea04b0 100644 (file)
--- 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 8b897c0fafd4fa17871afccf2ff37f60fc5d31ec..c1488cca6306d4f775b0dfc7c5344218fef9506b 100644 (file)
--- 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 7adb005f86123c8f2326f4066d3d8844b1b5871c..46843e9511abd8fb51eaab91c1194d9d2566c871 100644 (file)
--- 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 491011d1674d5e3442b7624847d797b4b9b011a0..3e45178315b945b71eb4312f2a8bc5c30c254af1 100644 (file)
--- 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 17926cf6f143488354edf118735e82fb2fddabe7..692c6cccbde8b074417e05b31b4ccd5ef474fcb4 100644 (file)
--- 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 c9de76b1348a291c8a98dabc213eced0a52f9e82..c1751b472a7f1667edf909e1457bf78a8d6199d6 100644 (file)
--- 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 5f5f7d55f591b793389bad0e0d20eef79705f654..43a51f1ab121f2966206307fb012d752209bdffe 100644 (file)
--- 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 d606cfb61384d7f299f0b1bf5828817a81698745..df33bd6ab8e049708e94d52a114fed3c564dc1e7 100644 (file)
--- 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 265e60ce9a4ecfd6417d80abaf25f7a5f87e667e..6743f8fc9e17a3f2a7eaea30ca43a980b828a004 100644 (file)
--- 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 b4436d3c91f05e45393913a8a30b5b00dcb3f1e3..fcba7f66a026a1515ac359d3757e6c239fbbb932 100755 (executable)
--- 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 35321a9305eeb0d5fdaefb3d0755ff24a33810be..f7b85f3820823e2fe532c06c838b671cdd1dd4b0 100755 (executable)
--- 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