[elbe-devel] [PATCH 3/6] Replace copyright information with SPDX-FileCopyrightText
Bastian Germann
bage at linutronix.de
Wed May 17 18:03:39 CEST 2023
Use the SPDX-FileCopyrightText for copyright information instead of
free-form comments. While at it, replace the individual Linutronix
authors with Linutronix GmbH, which is the correct copyright assignment
for their contributions. Make sure that all of the removed names are listed
in the AUTHORS or THANKS files.
Add missing copyright info with the same format.
Fix some docs wording along the way.
Signed-off-by: Bastian Germann <bage at linutronix.de>
---
.gitignore | 3 +++
.pylintrc | 4 +---
AUTHORS | 5 +++--
README.adoc | 3 +++
THANKS | 17 ++++++++++++++---
contrib/dockerfile/Dockerfile.in | 6 ++----
contrib/dockerfile/Makefile | 5 ++---
contrib/dockerfile/README.md | 5 ++---
debian/copyright | 5 +++--
docs/Makefile | 5 +----
docs/asciidoc.conf | 2 ++
docs/conf.py | 2 ++
docs/elbe-add.txt | 3 +++
docs/elbe-buildchroot.txt | 3 +++
docs/elbe-buildsdk.txt | 3 +++
docs/elbe-buildsysroot.txt | 3 +++
docs/elbe-check_updates.txt | 3 +++
docs/elbe-chg_archive.txt | 3 +++
docs/elbe-chroot.txt | 3 +++
docs/elbe-control.txt | 3 +++
docs/elbe-daemon.txt | 5 ++++-
docs/elbe-db.txt | 3 +++
docs/elbe-debianize.txt | 3 +++
docs/elbe-diff.txt | 3 +++
docs/elbe-fetch_initvm_pkgs.txt | 3 +++
docs/elbe-gen_update.txt | 3 +++
docs/elbe-genlicence.txt | 3 +++
docs/elbe-get_archive.txt | 3 +++
docs/elbe-hdimg.txt | 3 +++
docs/elbe-init.txt | 3 +++
docs/elbe-initvm.txt | 3 +++
docs/elbe-mkcdrom.txt | 3 +++
docs/elbe-parselicence.txt | 3 +++
docs/elbe-pbuilder.txt | 3 +++
docs/elbe-pkgdiff.txt | 3 +++
docs/elbe-preprocess.txt | 3 +++
docs/elbe-prjrepo.txt | 3 +++
docs/elbe-remove_sign.txt | 3 +++
docs/elbe-repodir.txt | 3 +++
docs/elbe-setsel.txt | 3 +++
docs/elbe-show.txt | 5 ++++-
docs/elbe-sign.txt | 3 +++
docs/elbe-toolchainextract.txt | 3 +++
docs/elbe-updated.txt | 3 +++
docs/elbe-validate.txt | 3 +++
docs/elbe-xsdtoasciidoc.txt | 3 +++
docs/elbe.txt | 3 +++
docs/elbeoverview-en.txt | 5 ++++-
docs/index.rst | 4 ++++
docs/quickstart.txt | 3 +++
elbe | 6 +-----
elbepack/aptpkgutils.py | 6 ++----
elbepack/aptprogress.py | 4 +---
elbepack/archivedir.py | 3 +--
elbepack/asyncworker.py | 5 +----
elbepack/cdroms.py | 6 +-----
elbepack/changelogxml.py | 3 +--
elbepack/commands/add.py | 3 +--
elbepack/commands/adjustpkgs.py | 4 +---
elbepack/commands/bootup-check.py | 3 +--
elbepack/commands/buildchroot.py | 7 ++-----
elbepack/commands/buildsdk.py | 3 +--
elbepack/commands/buildsysroot.py | 5 +----
elbepack/commands/check-build.py | 3 +--
elbepack/commands/check_updates.py | 5 +----
elbepack/commands/chg_archive.py | 3 +--
elbepack/commands/chroot.py | 6 +-----
elbepack/commands/control.py | 5 +----
elbepack/commands/daemon.py | 3 +--
elbepack/commands/db.py | 3 +--
elbepack/commands/diff.py | 3 +--
elbepack/commands/fetch_initvm_pkgs.py | 4 +---
elbepack/commands/gen_update.py | 6 +-----
elbepack/commands/genlicence.py | 4 +---
elbepack/commands/get_archive.py | 4 +---
elbepack/commands/hdimg.py | 5 +----
elbepack/commands/init.py | 5 +----
elbepack/commands/initvm.py | 4 +---
elbepack/commands/mkcdrom.py | 7 ++-----
elbepack/commands/parselicence.py | 4 +---
elbepack/commands/pbuilder.py | 4 +---
elbepack/commands/pin_versions.py | 4 +---
elbepack/commands/pkgdiff.py | 5 +----
elbepack/commands/preprocess.py | 4 +---
elbepack/commands/prjrepo.py | 5 +----
elbepack/commands/remove_sign.py | 4 +---
elbepack/commands/setsel.py | 4 +---
elbepack/commands/show.py | 4 +---
elbepack/commands/sign.py | 4 +---
elbepack/commands/test.py | 3 +--
elbepack/commands/toolchainextract.py | 4 +---
elbepack/commands/updated.py | 6 ++----
elbepack/commands/validate.py | 4 +---
elbepack/commands/xsdtoasciidoc.py | 4 +---
elbepack/config.py | 5 +----
elbepack/daemons/soap/__init__.py | 4 +---
elbepack/daemons/soap/authentication.py | 4 +---
elbepack/daemons/soap/datatypes.py | 4 +---
elbepack/daemons/soap/esoap.py | 7 ++-----
elbepack/daemons/soap/faults.py | 4 +---
elbepack/db.py | 6 +-----
elbepack/dbaction.py | 5 +----
elbepack/debinstaller.py | 3 +--
elbepack/debpkg.py | 4 +---
elbepack/default-preseed.xml | 4 ++++
elbepack/directories.py | 5 +----
elbepack/dosunix.py | 3 ++-
elbepack/dump.py | 5 +----
elbepack/efilesystem.py | 6 +-----
elbepack/egpg.py | 5 +----
elbepack/elbeproject.py | 8 +-------
elbepack/elbexml.py | 9 ++-------
elbepack/filesystem.py | 4 +---
elbepack/finetuning.py | 6 +-----
elbepack/fstab.py | 6 ++----
elbepack/hashes.py | 3 +--
elbepack/hdimg.py | 7 +------
elbepack/init/Makefile.mako | 8 +++-----
elbepack/init/apt.conf.mako | 3 +--
elbepack/init/default-init.xml | 4 ++++
elbepack/init/init-elbe.sh.mako | 5 +----
elbepack/init/libvirt.xml.mako | 7 ++-----
elbepack/init/preseed.cfg.mako | 7 ++-----
elbepack/initvmaction.py | 9 ++-------
elbepack/isooptions.py | 3 +--
elbepack/junit.py | 3 +--
elbepack/licencexml.py | 4 +---
elbepack/log.py | 3 +--
elbepack/makofiles/preferences.mako | 8 +++-----
elbepack/packers.py | 3 +--
elbepack/pbuilder.py | 6 +-----
elbepack/pbuilderaction.py | 4 +---
elbepack/pkgarchive.py | 4 +---
elbepack/pkgutils.py | 5 +----
elbepack/projectmanager.py | 6 +-----
elbepack/repomanager.py | 7 +------
elbepack/rfs.py | 8 ++------
elbepack/rpcaptcache.py | 6 +-----
elbepack/shellhelper.py | 6 ++----
elbepack/soapclient.py | 7 ++-----
elbepack/templates.py | 4 +---
elbepack/tests/test_doctest.py | 3 +--
elbepack/tests/test_efilesystem.py | 4 +---
elbepack/tests/test_preproc.py | 4 +---
elbepack/tests/test_pylint.py | 3 +--
elbepack/tests/test_version.py | 4 +---
elbepack/tests/test_xml.py | 3 +--
elbepack/toolchain.py | 4 +---
elbepack/treeutils.py | 4 +---
elbepack/updated.py | 9 ++-------
elbepack/updated_monitors.py | 5 ++---
elbepack/updatepkg.py | 4 +---
elbepack/validate.py | 5 +----
elbepack/version.py | 4 +---
elbepack/virtapt.py | 7 ++-----
elbepack/xmldefaults.py | 6 +-----
elbepack/xmlpreprocess.py | 5 +----
elbepack/xsdtoasciidoc.mako | 4 ++--
elbepack/ziparchives.py | 4 +---
setup.py | 4 +---
test/updated.py | 4 +---
tests/pbuilder-amd64.xml | 4 ++++
tests/preproc-01.xml | 4 ++++
tests/preproc-02.xml | 4 ++++
tests/simple-amd64-bookworm.xml | 4 ++++
tests/simple-amd64-with-grub-uefi.xml | 4 ++++
tests/simple-amd64-with-grub.xml | 4 ++++
tests/simple-arm64.xml | 4 ++++
tests/simple-armhf.xml | 4 ++++
tests/xinclude/simple.xml | 4 ++++
170 files changed, 331 insertions(+), 416 deletions(-)
diff --git a/.gitignore b/.gitignore
index ffd25c0be3..6eebcc5e36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: 0BSD
+# SPDX-FileCopyrightText: Linutronix GmbH
+
tags
.pybuild
elbe.egg-info
diff --git a/.pylintrc b/.pylintrc
index c301422900..543c15e705 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2017-2018 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017-2018 Linutronix GmbH
[MASTER]
diff --git a/AUTHORS b/AUTHORS
index 2744e029af..1725dde460 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,11 @@
-Authors of ELBE
+# SPDX-License-Identifier: 0BSD
+# SPDX-FileCopyrightText: Linutronix GmbH
Torben Hohn
main author and former maintainer of elbe
Manuel Traut
- added UBI support and minor improvements to elbe
+ added UBI support and major improvements to elbe
Benedikt Spranger
concept of elbe and creator of the elbe prototype
diff --git a/README.adoc b/README.adoc
index 34eb628a37..465991291e 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
ELBE
====
diff --git a/THANKS b/THANKS
index 10fb1533de..9818f8d1c5 100644
--- a/THANKS
+++ b/THANKS
@@ -1,10 +1,21 @@
+# SPDX-License-Identifier: 0BSD
+# SPDX-FileCopyrightText: Linutronix GmbH
+
Anna-Maria Gleixner anna-maria at glx-um.de
Richard Weinberger richard at nod.at
-Stefan Gast stefan.gast at hs-weingarten.de
-Jan Altenberg jan.altenberg at linutronix.de
+Andreas Messerschmid andreas at linutronix.de
+Kurt Kanzenbach kurt at linutronix.de
+John Ogness john.ogness at linutronix.de
+Martin Kaistra martin.kaistra at linutronix.de
+Jan Altenberg
+Philipp Arras
+Olivier Dion
+Markus Kreidl
+Philipp Rosenberger
+Matthias Bühler Matthias.Buehler at de.trumpf.com
Stefan Städtler stefan.staedtler at siemens.com
Christian Eppler weblooker at silentchris.de
Silvio Fricke silvio.fricke at gmail.com
Ferdinand Schwenk ferdinand.schwenk at emtrion.de
-Benedikt Spranger b.spranger at linutronix.de
+Sebastian Andrzej Siewior bigeasy at linutronix.de
Norbert Nemec nn at bloks.de
diff --git a/contrib/dockerfile/Dockerfile.in b/contrib/dockerfile/Dockerfile.in
index 0920525d92..90c6c96fc2 100644
--- a/contrib/dockerfile/Dockerfile.in
+++ b/contrib/dockerfile/Dockerfile.in
@@ -1,9 +1,7 @@
-#
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Silvio Fricke <silvio.fricke at gmail.com>
-# Copyright (c) 2018 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2015 Silvio Fricke <silvio.fricke at gmail.com>
+# SPDX-FileCopyrightText: 2018 Linutronix GmbH
# This Dockerfile generate a image for the elbe buildsystem
FROM debian:bullseye
diff --git a/contrib/dockerfile/Makefile b/contrib/dockerfile/Makefile
index f66de31a61..024d80d43f 100644
--- a/contrib/dockerfile/Makefile
+++ b/contrib/dockerfile/Makefile
@@ -1,8 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015 Silvio Fricke <silvio.fricke at gmail.com>
-# Copyright (c) 2018 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015 Silvio Fricke <silvio.fricke at gmail.com>
+# SPDX-FileCopyrightText: 2018 Linutronix GmbH
IMAGENAME ?= elbe-devel-image
CONTAINERNAME ?= elbe-devel
diff --git a/contrib/dockerfile/README.md b/contrib/dockerfile/README.md
index 81f304be3e..2b5c2e326c 100644
--- a/contrib/dockerfile/README.md
+++ b/contrib/dockerfile/README.md
@@ -2,10 +2,9 @@
<?
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Silvio Fricke <silvio.fricke at gmail.com>
-# Copyright (c) 2018 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2015 Silvio Fricke <silvio.fricke at gmail.com>
+# SPDX-FileCopyrightText: 2018 Linutronix GmbH
?>
[elbe][elb] is a debian based system to generate root-filesystems for embedded
diff --git a/debian/copyright b/debian/copyright
index fdf33abd18..317c4234f4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Linutronix GmbH <info at linutronix.de>
Source: https://github.com/Linutronix/elbe/
Files: *
-Copyright: (c) 2013, Torben Hohn, Linutronix GmbH, Manuel Traut, Linutronix GmbH
+Copyright: Linutronix GmbH
License: GPL-3+
Files: contrib/k8s/*
@@ -36,7 +36,8 @@ License: GPL-2
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
-Files: examples/*
+Files: .gitignore AUTHORS THANKS examples/*
+ docs/asciidoc.conf docs/conf.py
Copyright: Linutronix GmbH
License: 0BSD
Permission to use, copy, modify, and/or distribute this software for any
diff --git a/docs/Makefile b/docs/Makefile
index b976eb8b3e..8928507108 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2015, 2017-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2015, 2017-2018 Linutronix GmbH
ELBE_VERSION=$(`../elbe --version | awk '{ print $2 }'`)
diff --git a/docs/asciidoc.conf b/docs/asciidoc.conf
index e12750108b..d4078b1e6a 100644
--- a/docs/asciidoc.conf
+++ b/docs/asciidoc.conf
@@ -1,4 +1,6 @@
## linkgit: macro
+# SPDX-License-Identifier: 0BSD
+# SPDX-FileCopyrightText: Linutronix GmbH
#
# Usage: linkgit:command[manpage-section]
#
diff --git a/docs/conf.py b/docs/conf.py
index 2cd19607f1..86bad6de23 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*-
+# SPDX-License-Identifier: 0BSD
+# SPDX-FileCopyrightText: Linutronix GmbH
#
# ELBE documentation build configuration file, created by
# sphinx-quickstart on Mon May 8 15:56:24 2017.
diff --git a/docs/elbe-add.txt b/docs/elbe-add.txt
index e513bb6ee2..f664c9d12c 100644
--- a/docs/elbe-add.txt
+++ b/docs/elbe-add.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-add(1)
===========
diff --git a/docs/elbe-buildchroot.txt b/docs/elbe-buildchroot.txt
index e0f7fff76e..d41576224b 100644
--- a/docs/elbe-buildchroot.txt
+++ b/docs/elbe-buildchroot.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-buildchroot(1)
===================
diff --git a/docs/elbe-buildsdk.txt b/docs/elbe-buildsdk.txt
index 42fbe08203..99d28dc33a 100644
--- a/docs/elbe-buildsdk.txt
+++ b/docs/elbe-buildsdk.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-buildsdk(1)
================
diff --git a/docs/elbe-buildsysroot.txt b/docs/elbe-buildsysroot.txt
index cd1e2b7bb1..4926404211 100644
--- a/docs/elbe-buildsysroot.txt
+++ b/docs/elbe-buildsysroot.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-buildsysroot(1)
====================
diff --git a/docs/elbe-check_updates.txt b/docs/elbe-check_updates.txt
index 3f17292bd9..76f9077ed9 100644
--- a/docs/elbe-check_updates.txt
+++ b/docs/elbe-check_updates.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-check_updates(1)
=====================
diff --git a/docs/elbe-chg_archive.txt b/docs/elbe-chg_archive.txt
index f6d9af952f..ffbb0dd173 100644
--- a/docs/elbe-chg_archive.txt
+++ b/docs/elbe-chg_archive.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-chg_archive(1)
===================
diff --git a/docs/elbe-chroot.txt b/docs/elbe-chroot.txt
index 3f5010d837..74f6682f45 100644
--- a/docs/elbe-chroot.txt
+++ b/docs/elbe-chroot.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-chroot(1)
==============
diff --git a/docs/elbe-control.txt b/docs/elbe-control.txt
index d2893dcc39..5afb51a5ce 100644
--- a/docs/elbe-control.txt
+++ b/docs/elbe-control.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-control(1)
===============
diff --git a/docs/elbe-daemon.txt b/docs/elbe-daemon.txt
index e9f1f569b0..0c02eb3829 100644
--- a/docs/elbe-daemon.txt
+++ b/docs/elbe-daemon.txt
@@ -1,5 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-daemon(1)
-================
+==============
NAME
----
diff --git a/docs/elbe-db.txt b/docs/elbe-db.txt
index 86c699ab68..48770047e0 100644
--- a/docs/elbe-db.txt
+++ b/docs/elbe-db.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-db(1)
==========
diff --git a/docs/elbe-debianize.txt b/docs/elbe-debianize.txt
index 60f9a5fb99..41fbcada0a 100644
--- a/docs/elbe-debianize.txt
+++ b/docs/elbe-debianize.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-debianize(1)
=================
diff --git a/docs/elbe-diff.txt b/docs/elbe-diff.txt
index 3d02f10f49..71cb273851 100644
--- a/docs/elbe-diff.txt
+++ b/docs/elbe-diff.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-diff(1)
============
diff --git a/docs/elbe-fetch_initvm_pkgs.txt b/docs/elbe-fetch_initvm_pkgs.txt
index 86a9246abf..0d9b099069 100644
--- a/docs/elbe-fetch_initvm_pkgs.txt
+++ b/docs/elbe-fetch_initvm_pkgs.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-fetch_initvm_pkgs(1)
=========================
diff --git a/docs/elbe-gen_update.txt b/docs/elbe-gen_update.txt
index 706d196b79..18be3016ff 100644
--- a/docs/elbe-gen_update.txt
+++ b/docs/elbe-gen_update.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-gen_update(1)
==================
diff --git a/docs/elbe-genlicence.txt b/docs/elbe-genlicence.txt
index 349923f989..d508242c9e 100644
--- a/docs/elbe-genlicence.txt
+++ b/docs/elbe-genlicence.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-genlicence(1)
==================
diff --git a/docs/elbe-get_archive.txt b/docs/elbe-get_archive.txt
index c074a3f798..b671e12555 100644
--- a/docs/elbe-get_archive.txt
+++ b/docs/elbe-get_archive.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-get_archive(1)
===================
diff --git a/docs/elbe-hdimg.txt b/docs/elbe-hdimg.txt
index 7a3efe9a99..1822495f35 100644
--- a/docs/elbe-hdimg.txt
+++ b/docs/elbe-hdimg.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-hdimg(1)
=============
diff --git a/docs/elbe-init.txt b/docs/elbe-init.txt
index 2ee577f2e2..430127c5f6 100644
--- a/docs/elbe-init.txt
+++ b/docs/elbe-init.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-init(1)
============
diff --git a/docs/elbe-initvm.txt b/docs/elbe-initvm.txt
index 5416f16b6f..d1fada76ac 100644
--- a/docs/elbe-initvm.txt
+++ b/docs/elbe-initvm.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-initvm(1)
===============
diff --git a/docs/elbe-mkcdrom.txt b/docs/elbe-mkcdrom.txt
index 1aa7cf506b..88c6924bdf 100644
--- a/docs/elbe-mkcdrom.txt
+++ b/docs/elbe-mkcdrom.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-mkcdrom(1)
===============
diff --git a/docs/elbe-parselicence.txt b/docs/elbe-parselicence.txt
index e55b5843c9..cd861380cd 100644
--- a/docs/elbe-parselicence.txt
+++ b/docs/elbe-parselicence.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-parselicence(1)
===================
diff --git a/docs/elbe-pbuilder.txt b/docs/elbe-pbuilder.txt
index 80feabd19c..f729784783 100644
--- a/docs/elbe-pbuilder.txt
+++ b/docs/elbe-pbuilder.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-pbuilder(1)
================
diff --git a/docs/elbe-pkgdiff.txt b/docs/elbe-pkgdiff.txt
index e207cb6878..65e30e2cd3 100644
--- a/docs/elbe-pkgdiff.txt
+++ b/docs/elbe-pkgdiff.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-pkgdiff(1)
===============
diff --git a/docs/elbe-preprocess.txt b/docs/elbe-preprocess.txt
index 470a577efa..e488b409a7 100644
--- a/docs/elbe-preprocess.txt
+++ b/docs/elbe-preprocess.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-preprocess(1)
==================
diff --git a/docs/elbe-prjrepo.txt b/docs/elbe-prjrepo.txt
index 17d66783fb..59613e72e8 100644
--- a/docs/elbe-prjrepo.txt
+++ b/docs/elbe-prjrepo.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-prjrepo(1)
===============
diff --git a/docs/elbe-remove_sign.txt b/docs/elbe-remove_sign.txt
index c7b6847d05..f206685aca 100644
--- a/docs/elbe-remove_sign.txt
+++ b/docs/elbe-remove_sign.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-remove_sign(1)
===================
diff --git a/docs/elbe-repodir.txt b/docs/elbe-repodir.txt
index 6fc1c34ee7..6ac0563155 100644
--- a/docs/elbe-repodir.txt
+++ b/docs/elbe-repodir.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-repodir(1)
===============
diff --git a/docs/elbe-setsel.txt b/docs/elbe-setsel.txt
index 0e0323414f..62336bf4ad 100644
--- a/docs/elbe-setsel.txt
+++ b/docs/elbe-setsel.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-setsel(1)
==============
diff --git a/docs/elbe-show.txt b/docs/elbe-show.txt
index 916a14652b..d2810aa8ea 100644
--- a/docs/elbe-show.txt
+++ b/docs/elbe-show.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-show(1)
============
@@ -17,7 +20,7 @@ DESCRIPTION
-----------
This command generates a human readable overview of a given ELBE XML file.
-It's useful to get an idea for what is a specific XML file was designed.
+It's useful to get an idea what a specific XML file was designed for.
OPTIONS
diff --git a/docs/elbe-sign.txt b/docs/elbe-sign.txt
index d507964cb5..dacdf93e17 100644
--- a/docs/elbe-sign.txt
+++ b/docs/elbe-sign.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-sign(1)
============
diff --git a/docs/elbe-toolchainextract.txt b/docs/elbe-toolchainextract.txt
index 15d8d849d2..24163bb4c8 100644
--- a/docs/elbe-toolchainextract.txt
+++ b/docs/elbe-toolchainextract.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-toolchainextract(1)
========================
diff --git a/docs/elbe-updated.txt b/docs/elbe-updated.txt
index 8042f88de9..f1c177c16f 100644
--- a/docs/elbe-updated.txt
+++ b/docs/elbe-updated.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-updated(1)
===============
diff --git a/docs/elbe-validate.txt b/docs/elbe-validate.txt
index b55936bbbb..82e2e24a26 100644
--- a/docs/elbe-validate.txt
+++ b/docs/elbe-validate.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-validate(1)
================
diff --git a/docs/elbe-xsdtoasciidoc.txt b/docs/elbe-xsdtoasciidoc.txt
index e6b7027e42..9b60f6ced3 100644
--- a/docs/elbe-xsdtoasciidoc.txt
+++ b/docs/elbe-xsdtoasciidoc.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe-xsdtoasciidoc(1)
=====================
diff --git a/docs/elbe.txt b/docs/elbe.txt
index 6536e32f17..f0f44b9d30 100644
--- a/docs/elbe.txt
+++ b/docs/elbe.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
elbe(1)
=======
diff --git a/docs/elbeoverview-en.txt b/docs/elbeoverview-en.txt
index 360e034ed6..46e843a330 100644
--- a/docs/elbeoverview-en.txt
+++ b/docs/elbeoverview-en.txt
@@ -1,4 +1,7 @@
-Embedded Linux Build Environment (elbe)
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
+Embedded Linux Build Environment (elbe)
=======================================
Debian-based system to generate root filesystems for embedded devices.
diff --git a/docs/index.rst b/docs/index.rst
index 9d7391fec3..dc65351b29 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,3 +1,7 @@
+..
+ SPDX-License-Identifier: GPL-3.0-or-later
+ SPDX-FileCopyrightText: Linutronix GmbH
+
ELBE docs
==========
diff --git a/docs/quickstart.txt b/docs/quickstart.txt
index 4251af8244..607b6ce415 100644
--- a/docs/quickstart.txt
+++ b/docs/quickstart.txt
@@ -1,3 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-FileCopyrightText: Linutronix GmbH
+
Embedded Linux Build Environment (ELBE) Quickstart Guide
========================================================
ELBE is a Debian-based system to generate root filesystems for embedded devices.
diff --git a/elbe b/elbe
index eb0cdca94a..6f54e04ccd 100755
--- a/elbe
+++ b/elbe
@@ -1,12 +1,8 @@
#!/usr/bin/env python3
#
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014 Sebastian Andrzej Siewior <bigeasy at linutronix.de>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2017 Linutronix GmbH
import sys
diff --git a/elbepack/aptpkgutils.py b/elbepack/aptpkgutils.py
index e21f82cab3..4fbc18329f 100644
--- a/elbepack/aptpkgutils.py
+++ b/elbepack/aptpkgutils.py
@@ -1,9 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2005-2009 Canonical
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
import os
import logging
diff --git a/elbepack/aptprogress.py b/elbepack/aptprogress.py
index b2311d0e27..ce0cdb5a88 100644
--- a/elbepack/aptprogress.py
+++ b/elbepack/aptprogress.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import os
diff --git a/elbepack/archivedir.py b/elbepack/archivedir.py
index b0082f01e7..2a5aee1a63 100644
--- a/elbepack/archivedir.py
+++ b/elbepack/archivedir.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2018 Benedikt Spranger <b.spranger at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2018 Linutronix GmbH
import bz2
import os
diff --git a/elbepack/asyncworker.py b/elbepack/asyncworker.py
index 5cd65da9cd..29faed5812 100644
--- a/elbepack/asyncworker.py
+++ b/elbepack/asyncworker.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2015-2018 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
from threading import Thread
from queue import Queue
diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py
index 17045affde..d0eb49d23a 100644
--- a/elbepack/cdroms.py
+++ b/elbepack/cdroms.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import os
import logging
diff --git a/elbepack/changelogxml.py b/elbepack/changelogxml.py
index 869783cd65..22750d167b 100644
--- a/elbepack/changelogxml.py
+++ b/elbepack/changelogxml.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2019 Torben Hohn <torben.hohn at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2019 Linutronix GmbH
from elbepack.treeutils import etree
diff --git a/elbepack/commands/add.py b/elbepack/commands/add.py
index 92533162be..721bd8b2fc 100644
--- a/elbepack/commands/add.py
+++ b/elbepack/commands/add.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2016-2017 Linutronix GmbH
import sys
diff --git a/elbepack/commands/adjustpkgs.py b/elbepack/commands/adjustpkgs.py
index c812307cf3..f1137ffdcc 100644
--- a/elbepack/commands/adjustpkgs.py
+++ b/elbepack/commands/adjustpkgs.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2017 Linutronix GmbH
import logging
import sys
diff --git a/elbepack/commands/bootup-check.py b/elbepack/commands/bootup-check.py
index 8dc5686692..be9cd4a823 100644
--- a/elbepack/commands/bootup-check.py
+++ b/elbepack/commands/bootup-check.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
import apt
import apt_pkg
diff --git a/elbepack/commands/buildchroot.py b/elbepack/commands/buildchroot.py
index efab945eb0..c36ec2ff88 100644
--- a/elbepack/commands/buildchroot.py
+++ b/elbepack/commands/buildchroot.py
@@ -1,10 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2013-2014, 2016-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2015 Matthias Buehler <Matthias.Buehler at de.trumpf.com>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2017 Linutronix GmbH
+# SPDX-FileCopyrightText: 2015 Matthias Buehler <Matthias.Buehler at de.trumpf.com>
from optparse import OptionParser
import sys
diff --git a/elbepack/commands/buildsdk.py b/elbepack/commands/buildsdk.py
index 2206db303c..56b6a97dd3 100644
--- a/elbepack/commands/buildsdk.py
+++ b/elbepack/commands/buildsdk.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2017-2018 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2017-2018 Linutronix GmbH
from optparse import OptionParser
import sys
diff --git a/elbepack/commands/buildsysroot.py b/elbepack/commands/buildsysroot.py
index 5f8f98cd51..e7dee8c25c 100644
--- a/elbepack/commands/buildsysroot.py
+++ b/elbepack/commands/buildsysroot.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import logging
from optparse import OptionParser
diff --git a/elbepack/commands/check-build.py b/elbepack/commands/check-build.py
index e95ced262b..684c0dda45 100644
--- a/elbepack/commands/check-build.py
+++ b/elbepack/commands/check-build.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2020 Olivier Dion <dion at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2020 Linutronix GmbH
import glob
import logging
diff --git a/elbepack/commands/check_updates.py b/elbepack/commands/check_updates.py
index e02226cd42..bc1cea8d63 100644
--- a/elbepack/commands/check_updates.py
+++ b/elbepack/commands/check_updates.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2013-2014, 2017-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 Holger Dengler <dengler at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2018 Linutronix GmbH
import sys
diff --git a/elbepack/commands/chg_archive.py b/elbepack/commands/chg_archive.py
index 2d4643e7e0..538935d842 100644
--- a/elbepack/commands/chg_archive.py
+++ b/elbepack/commands/chg_archive.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013, 2015, 2017 Linutronix GmbH
import sys
diff --git a/elbepack/commands/chroot.py b/elbepack/commands/chroot.py
index 02915ab446..9e61550504 100644
--- a/elbepack/commands/chroot.py
+++ b/elbepack/commands/chroot.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
from optparse import OptionParser
import sys
diff --git a/elbepack/commands/control.py b/elbepack/commands/control.py
index 000e5f5058..82188dfb72 100644
--- a/elbepack/commands/control.py
+++ b/elbepack/commands/control.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014, 2016-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import socket
import sys
diff --git a/elbepack/commands/daemon.py b/elbepack/commands/daemon.py
index 08a3b52efc..15aead6195 100644
--- a/elbepack/commands/daemon.py
+++ b/elbepack/commands/daemon.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
import sys
from optparse import OptionParser
diff --git a/elbepack/commands/db.py b/elbepack/commands/db.py
index 08185d73d5..93f4567e07 100644
--- a/elbepack/commands/db.py
+++ b/elbepack/commands/db.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
from elbepack.dbaction import DbAction
diff --git a/elbepack/commands/diff.py b/elbepack/commands/diff.py
index 446c002942..13a4868989 100644
--- a/elbepack/commands/diff.py
+++ b/elbepack/commands/diff.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2014, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2014, 2017 Linutronix GmbH
import os
import sys
diff --git a/elbepack/commands/fetch_initvm_pkgs.py b/elbepack/commands/fetch_initvm_pkgs.py
index a45bdb55ac..93870004ff 100644
--- a/elbepack/commands/fetch_initvm_pkgs.py
+++ b/elbepack/commands/fetch_initvm_pkgs.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2018 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2018 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2018 Linutronix GmbH
import sys
import logging
diff --git a/elbepack/commands/gen_update.py b/elbepack/commands/gen_update.py
index bf8e8739ee..6c22e5ef4b 100644
--- a/elbepack/commands/gen_update.py
+++ b/elbepack/commands/gen_update.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
from optparse import OptionParser
import sys
diff --git a/elbepack/commands/genlicence.py b/elbepack/commands/genlicence.py
index 1ef8cd2133..8cc34dbeb2 100644
--- a/elbepack/commands/genlicence.py
+++ b/elbepack/commands/genlicence.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014, 2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2016 Linutronix GmbH
from optparse import OptionParser
import sys
diff --git a/elbepack/commands/get_archive.py b/elbepack/commands/get_archive.py
index 438bb8c299..32ede63e95 100644
--- a/elbepack/commands/get_archive.py
+++ b/elbepack/commands/get_archive.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013, 2017 Linutronix GmbH
import os
import sys
diff --git a/elbepack/commands/hdimg.py b/elbepack/commands/hdimg.py
index 3f4d6031b6..acd34a3cc8 100644
--- a/elbepack/commands/hdimg.py
+++ b/elbepack/commands/hdimg.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2012-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2012-2017 Linutronix GmbH
import sys
import logging
diff --git a/elbepack/commands/init.py b/elbepack/commands/init.py
index b7b6e092a5..d613390ed2 100644
--- a/elbepack/commands/init.py
+++ b/elbepack/commands/init.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015, 2017, 2018 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2015, 2017, 2018 Linutronix GmbH
import os
import sys
diff --git a/elbepack/commands/initvm.py b/elbepack/commands/initvm.py
index 321af3fbc5..74655a5583 100644
--- a/elbepack/commands/initvm.py
+++ b/elbepack/commands/initvm.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015, 2017 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2015-2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2017 Linutronix GmbH
import sys
import os
diff --git a/elbepack/commands/mkcdrom.py b/elbepack/commands/mkcdrom.py
index 0dbeb3c7bf..de1709a1b0 100644
--- a/elbepack/commands/mkcdrom.py
+++ b/elbepack/commands/mkcdrom.py
@@ -1,10 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2015 Matthias Buehler <Matthias.Buehler at de.trumpf.com>
-# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
+# SPDX-FileCopyrightText: 2015 Matthias Buehler <Matthias.Buehler at de.trumpf.com>
from optparse import OptionParser
import sys
diff --git a/elbepack/commands/parselicence.py b/elbepack/commands/parselicence.py
index 24141c80df..b57e4c5c55 100644
--- a/elbepack/commands/parselicence.py
+++ b/elbepack/commands/parselicence.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2016-2017 Linutronix GmbH
from optparse import OptionParser
from datetime import datetime
diff --git a/elbepack/commands/pbuilder.py b/elbepack/commands/pbuilder.py
index 88a89dfa84..4eb534d428 100644
--- a/elbepack/commands/pbuilder.py
+++ b/elbepack/commands/pbuilder.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2017 Linutronix GmbH
import sys
diff --git a/elbepack/commands/pin_versions.py b/elbepack/commands/pin_versions.py
index b44af4485e..bf77fc7492 100644
--- a/elbepack/commands/pin_versions.py
+++ b/elbepack/commands/pin_versions.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2016-2017 Linutronix GmbH
import sys
diff --git a/elbepack/commands/pkgdiff.py b/elbepack/commands/pkgdiff.py
index 789c70825a..a94e7c4e96 100644
--- a/elbepack/commands/pkgdiff.py
+++ b/elbepack/commands/pkgdiff.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2015, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2017 Linutronix GmbH
import os
import sys
diff --git a/elbepack/commands/preprocess.py b/elbepack/commands/preprocess.py
index d326db0e33..823ee8d8d1 100644
--- a/elbepack/commands/preprocess.py
+++ b/elbepack/commands/preprocess.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2017 Linutronix GmbH
import sys
import os
diff --git a/elbepack/commands/prjrepo.py b/elbepack/commands/prjrepo.py
index 2488291145..9e597f40f6 100644
--- a/elbepack/commands/prjrepo.py
+++ b/elbepack/commands/prjrepo.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2017 Linutronix GmbH
import socket
import sys
diff --git a/elbepack/commands/remove_sign.py b/elbepack/commands/remove_sign.py
index 14cb3f8d7e..a9bb955edc 100644
--- a/elbepack/commands/remove_sign.py
+++ b/elbepack/commands/remove_sign.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
from elbepack.egpg import unsign_file
diff --git a/elbepack/commands/setsel.py b/elbepack/commands/setsel.py
index a7da2bc614..6d79f46de8 100644
--- a/elbepack/commands/setsel.py
+++ b/elbepack/commands/setsel.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2014, 2017 Linutronix GmbH
import sys
diff --git a/elbepack/commands/show.py b/elbepack/commands/show.py
index bba335d70f..09300222d7 100644
--- a/elbepack/commands/show.py
+++ b/elbepack/commands/show.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2015, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2015, 2017 Linutronix GmbH
import sys
diff --git a/elbepack/commands/sign.py b/elbepack/commands/sign.py
index b0e8290b6e..29c0318b31 100644
--- a/elbepack/commands/sign.py
+++ b/elbepack/commands/sign.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2015, 2017 Linutronix GmbH
from elbepack.egpg import sign_file
diff --git a/elbepack/commands/test.py b/elbepack/commands/test.py
index 2686826e7e..8d5de3a55f 100644
--- a/elbepack/commands/test.py
+++ b/elbepack/commands/test.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2020 Olivier Dion <dion at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2020 Linutronix GmbH
# elbepack/commands/test.py - Elbe unit test wrapper
diff --git a/elbepack/commands/toolchainextract.py b/elbepack/commands/toolchainextract.py
index 1388db8802..b09f0f9e3d 100644
--- a/elbepack/commands/toolchainextract.py
+++ b/elbepack/commands/toolchainextract.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
from optparse import OptionParser
from tempfile import mkdtemp
diff --git a/elbepack/commands/updated.py b/elbepack/commands/updated.py
index 1cf15241b9..7fcfae6bf8 100644
--- a/elbepack/commands/updated.py
+++ b/elbepack/commands/updated.py
@@ -1,9 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015 Ferdinand Schwenk <ferdinand at ping.lan>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015 Ferdinand Schwenk <ferdinand at ping.lan>
+# SPDX-FileCopyrightText: 2017 Linutronix GmbH
import os
import signal
diff --git a/elbepack/commands/validate.py b/elbepack/commands/validate.py
index 0dbe4eb0da..337d399126 100644
--- a/elbepack/commands/validate.py
+++ b/elbepack/commands/validate.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2017 Linutronix GmbH
import sys
import os
diff --git a/elbepack/commands/xsdtoasciidoc.py b/elbepack/commands/xsdtoasciidoc.py
index 5bcfb8c964..ab1bfeb763 100644
--- a/elbepack/commands/xsdtoasciidoc.py
+++ b/elbepack/commands/xsdtoasciidoc.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2017 Linutronix GmbH
import sys
diff --git a/elbepack/config.py b/elbepack/config.py
index d04a315b98..578cb090f7 100644
--- a/elbepack/config.py
+++ b/elbepack/config.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2016, 2018 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2016-2018 Linutronix GmbH
import os
diff --git a/elbepack/daemons/soap/__init__.py b/elbepack/daemons/soap/__init__.py
index 9bcabab827..6aa53679d9 100644
--- a/elbepack/daemons/soap/__init__.py
+++ b/elbepack/daemons/soap/__init__.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014, 2016-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import sys
import logging
diff --git a/elbepack/daemons/soap/authentication.py b/elbepack/daemons/soap/authentication.py
index febca6ae21..199f4f59db 100644
--- a/elbepack/daemons/soap/authentication.py
+++ b/elbepack/daemons/soap/authentication.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015, 2018 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2018 Linutronix GmbH
from functools import wraps
diff --git a/elbepack/daemons/soap/datatypes.py b/elbepack/daemons/soap/datatypes.py
index 7e3dafb014..4962a354f4 100644
--- a/elbepack/daemons/soap/datatypes.py
+++ b/elbepack/daemons/soap/datatypes.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2017 Linutronix GmbH
from spyne.model.complex import ComplexModel
from spyne.model.primitive import Unicode, DateTime, Integer
diff --git a/elbepack/daemons/soap/esoap.py b/elbepack/daemons/soap/esoap.py
index 2cf6fcd2ac..a61663f3ca 100644
--- a/elbepack/daemons/soap/esoap.py
+++ b/elbepack/daemons/soap/esoap.py
@@ -1,10 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2015-2016, 2018 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2016 Claudius Heine <ch at denx.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
+# SPDX-FileCopyrightText: 2016 Claudius Heine <ch at denx.de>
import binascii
import os
diff --git a/elbepack/daemons/soap/faults.py b/elbepack/daemons/soap/faults.py
index 88d6ed3c52..379e6251aa 100644
--- a/elbepack/daemons/soap/faults.py
+++ b/elbepack/daemons/soap/faults.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2017 Linutronix GmbH
from traceback import format_exc
from functools import wraps
diff --git a/elbepack/db.py b/elbepack/db.py
index 6824554d62..451e4fb70b 100644
--- a/elbepack/db.py
+++ b/elbepack/db.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014 Andreas Messerschmid <andreas at linutronix.de>
-# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
# pylint: disable=too-many-lines
diff --git a/elbepack/dbaction.py b/elbepack/dbaction.py
index dbd1715635..2d4a4ba85a 100644
--- a/elbepack/dbaction.py
+++ b/elbepack/dbaction.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import sys
diff --git a/elbepack/debinstaller.py b/elbepack/debinstaller.py
index 1544bed9d4..c3d8896203 100644
--- a/elbepack/debinstaller.py
+++ b/elbepack/debinstaller.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2018 Torben Hohn <torben.hohn at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2018 Linutronix GmbH
import sys
import os
diff --git a/elbepack/debpkg.py b/elbepack/debpkg.py
index 4e21865c08..14451cb3b0 100644
--- a/elbepack/debpkg.py
+++ b/elbepack/debpkg.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
import os
import string
diff --git a/elbepack/default-preseed.xml b/elbepack/default-preseed.xml
index 4fbcdaebf5..c3635dc3d5 100644
--- a/elbepack/default-preseed.xml
+++ b/elbepack/default-preseed.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<xml>
<preseed>
<conf owner="exim4-config" key="exim4/dc_eximconfig_configtype" type="select" value="no configuration at this time"/>
diff --git a/elbepack/directories.py b/elbepack/directories.py
index c088269c13..36c9b0d1d8 100644
--- a/elbepack/directories.py
+++ b/elbepack/directories.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015, 2017 Linutronix GmbH
import os
diff --git a/elbepack/dosunix.py b/elbepack/dosunix.py
index 5a56e3727a..3c60d36b4d 100644
--- a/elbepack/dosunix.py
+++ b/elbepack/dosunix.py
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2015-2022 Linutronix GmbH <info at linutronix.de>
+# SPDX-FileCopyrightText: 2015-2022 Linutronix GmbH
+
def dos2unix_str(d):
return d.replace('\r\n', '\n')
diff --git a/elbepack/dump.py b/elbepack/dump.py
index 36db39402b..f1e19816e5 100644
--- a/elbepack/dump.py
+++ b/elbepack/dump.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2015-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import logging
diff --git a/elbepack/efilesystem.py b/elbepack/efilesystem.py
index 59a86502d9..ca17b15b31 100644
--- a/elbepack/efilesystem.py
+++ b/elbepack/efilesystem.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2016-2017 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-# Copyright (c) 2018 Martin Kaistra <martin.kaistra at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2018 Linutronix GmbH
import os
import time
diff --git a/elbepack/egpg.py b/elbepack/egpg.py
index cfdb07998d..6109f91fc2 100644
--- a/elbepack/egpg.py
+++ b/elbepack/egpg.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Andreas Messerschmid <andreas at linutronix.de>
-# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2016 Linutronix GmbH
import logging
import os
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index 993eeb04de..5ba49d9276 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -1,12 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2016-2018 John Ogness <jogness at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-# Copyright (c) 2018 Martin Kaistra <martin.kaistra at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
# pylint: disable=too-many-lines
diff --git a/elbepack/elbexml.py b/elbepack/elbexml.py
index bc86ff3ce1..48e7130a84 100644
--- a/elbepack/elbexml.py
+++ b/elbepack/elbexml.py
@@ -1,12 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2015 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
-# Copyright (c) 2015 Benedikt Spranger <b.spranger at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
+# SPDX-FileCopyrightText: 2015 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
import os
import re
diff --git a/elbepack/filesystem.py b/elbepack/filesystem.py
index 8a3bb08eb3..2eba2c8404 100644
--- a/elbepack/filesystem.py
+++ b/elbepack/filesystem.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2017 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import os
import shutil
diff --git a/elbepack/finetuning.py b/elbepack/finetuning.py
index e67fe6d3ec..31aed610f9 100644
--- a/elbepack/finetuning.py
+++ b/elbepack/finetuning.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2017 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import os
import errno
diff --git a/elbepack/fstab.py b/elbepack/fstab.py
index aeff493e89..d65492ca81 100644
--- a/elbepack/fstab.py
+++ b/elbepack/fstab.py
@@ -1,9 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2014, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014, 2017 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2015 Matthias Buehler <matthias.buehler at de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2014, 2017 Linutronix GmbH
+# SPDX-FileCopyrightText: 2015 Matthias Buehler <matthias.buehler at de.trumpf.com>
import os
import time
diff --git a/elbepack/hashes.py b/elbepack/hashes.py
index dd953d3b90..a8db70b732 100644
--- a/elbepack/hashes.py
+++ b/elbepack/hashes.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2018 Torben Hohn <torben.hohn at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2018 Linutronix GmbH
import hashlib
from elbepack.shellhelper import system, CommandError
diff --git a/elbepack/hdimg.py b/elbepack/hdimg.py
index 6ac259e702..d3fe37128c 100644
--- a/elbepack/hdimg.py
+++ b/elbepack/hdimg.py
@@ -1,11 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015, 2017 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014, 2016-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2016, 2018 John Ogness <john.ogness at linutronix.de>
-# Copyright (c) 2016 Philipp Rosenberger <p.rosenberger at linutronix.de>
-# Copyright (c) 2018 Martin Kaistra <martin.kaistra at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
import logging
import os
diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
index 4c12672b9e..e32ec9f612 100644
--- a/elbepack/init/Makefile.mako
+++ b/elbepack/init/Makefile.mako
@@ -1,10 +1,8 @@
## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (c) 2014-2017 Torben Hohn <torben.hohn at linutronix.de>
-## Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
-## Copyright (c) 2017 Lukasz Walewski <lwalewski at s-can.at>
-##
## SPDX-License-Identifier: GPL-3.0-or-later
-##
+## SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
+## SPDX-FileCopyrightText: 2017 Lukasz Walewski <lwalewski at s-can.at>
+
<%
import multiprocessing
from elbepack.filesystem import size_to_int
diff --git a/elbepack/init/apt.conf.mako b/elbepack/init/apt.conf.mako
index aaba31bf1a..dd7886e5c1 100644
--- a/elbepack/init/apt.conf.mako
+++ b/elbepack/init/apt.conf.mako
@@ -1,7 +1,6 @@
## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-##
## SPDX-License-Identifier: GPL-3.0-or-later
+## SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
##
%if http_proxy:
Acquire {
diff --git a/elbepack/init/default-init.xml b/elbepack/init/default-init.xml
index 4374a0c2a8..4e8d0c9f2d 100644
--- a/elbepack/init/default-init.xml
+++ b/elbepack/init/default-init.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" created="2009-05-20T08:50:56" revision="6" xsi:schemaLocation="https://www.linutronix.de/projects/Elbe dbsfed.xsd">
<initvm>
<buildtype>amd64</buildtype>
diff --git a/elbepack/init/init-elbe.sh.mako b/elbepack/init/init-elbe.sh.mako
index e3fe2fad71..20992bc442 100644
--- a/elbepack/init/init-elbe.sh.mako
+++ b/elbepack/init/init-elbe.sh.mako
@@ -1,9 +1,6 @@
## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-## Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-## Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
-##
## SPDX-License-Identifier: GPL-3.0-or-later
+## SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
##
#! /bin/sh
<%
diff --git a/elbepack/init/libvirt.xml.mako b/elbepack/init/libvirt.xml.mako
index b45d80a501..0b37237b8e 100644
--- a/elbepack/init/libvirt.xml.mako
+++ b/elbepack/init/libvirt.xml.mako
@@ -1,10 +1,7 @@
## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-## Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-## Copyright (c) 2018 Troben Hohn <torben.hohn at linutronix.de>
-##
## SPDX-License-Identifier: GPL-3.0-or-later
-##
+## SPDX-FileCopyrightText: 2017-2018 Linutronix GmbH
+
<%
# TODO: Add dynamic name support
# TODO: Relativ file path for diskimage
diff --git a/elbepack/init/preseed.cfg.mako b/elbepack/init/preseed.cfg.mako
index ce1ecba6e7..0e01521d40 100644
--- a/elbepack/init/preseed.cfg.mako
+++ b/elbepack/init/preseed.cfg.mako
@@ -1,10 +1,7 @@
## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-## Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-## Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
-##
## SPDX-License-Identifier: GPL-3.0-or-later
-##
+## SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
+
<%
from elbepack.version import elbe_version, elbe_initvm_packagelist
from elbepack.filesystem import size_to_int
diff --git a/elbepack/initvmaction.py b/elbepack/initvmaction.py
index 497385bb89..412fe39310 100644
--- a/elbepack/initvmaction.py
+++ b/elbepack/initvmaction.py
@@ -1,12 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2015-2018 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2015 Silvio Fricke <silvio.fricke at gmail.com>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
-# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2018 Linutronix GmbH
+# SPDX-FileCopyrightText: 2015 Silvio Fricke <silvio.fricke at gmail.com>
import sys
import time
diff --git a/elbepack/isooptions.py b/elbepack/isooptions.py
index 87c0c7f6b8..ffaad4c979 100644
--- a/elbepack/isooptions.py
+++ b/elbepack/isooptions.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2019 Olivier Dion <dion at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2019 Linutronix GmbH
import logging
diff --git a/elbepack/junit.py b/elbepack/junit.py
index bbaf5a8278..305a367cdf 100644
--- a/elbepack/junit.py
+++ b/elbepack/junit.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2019 Olivier Dion <dion at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2019 Linutronix GmbH
import junit_xml as junit
diff --git a/elbepack/licencexml.py b/elbepack/licencexml.py
index 33021e56d8..31a1576cfe 100644
--- a/elbepack/licencexml.py
+++ b/elbepack/licencexml.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2016-2017 Linutronix GmbH
import io
diff --git a/elbepack/log.py b/elbepack/log.py
index 051737c0e7..8d315e4fd0 100644
--- a/elbepack/log.py
+++ b/elbepack/log.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2019 Olivier Dion <dion at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2019 Linutronix GmbH
import collections
diff --git a/elbepack/makofiles/preferences.mako b/elbepack/makofiles/preferences.mako
index 565ca49ec3..f4283985f1 100644
--- a/elbepack/makofiles/preferences.mako
+++ b/elbepack/makofiles/preferences.mako
@@ -1,10 +1,8 @@
## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-## Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
-## Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
-##
## SPDX-License-Identifier: GPL-3.0-or-later
-##
+## SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
+## SPDX-FileCopyrightText: 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
+
<%!
import textwrap
from textwrap import dedent
diff --git a/elbepack/packers.py b/elbepack/packers.py
index 110dcddbf6..782ff25451 100644
--- a/elbepack/packers.py
+++ b/elbepack/packers.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2019 Torben Hohn <torben.hohn at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2019 Linutronix GmbH
import os
from elbepack.shellhelper import CommandError, do
diff --git a/elbepack/pbuilder.py b/elbepack/pbuilder.py
index 51ba26b5b0..51b62fb67e 100644
--- a/elbepack/pbuilder.py
+++ b/elbepack/pbuilder.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015-2017 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2017 Linutronix GmbH
import os
diff --git a/elbepack/pbuilderaction.py b/elbepack/pbuilderaction.py
index 5cfa89c187..256bf6103e 100644
--- a/elbepack/pbuilderaction.py
+++ b/elbepack/pbuilderaction.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015-2017 Linutronix GmbH
import sys
import os
diff --git a/elbepack/pkgarchive.py b/elbepack/pkgarchive.py
index 92babf7194..38d3a0371f 100644
--- a/elbepack/pkgarchive.py
+++ b/elbepack/pkgarchive.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import errno
import logging
diff --git a/elbepack/pkgutils.py b/elbepack/pkgutils.py
index 4039ad8e33..f198b71b0d 100644
--- a/elbepack/pkgutils.py
+++ b/elbepack/pkgutils.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2015, 2017-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2018 Linutronix GmbH
import os
import re
diff --git a/elbepack/projectmanager.py b/elbepack/projectmanager.py
index ae20cfe133..a807d797dd 100644
--- a/elbepack/projectmanager.py
+++ b/elbepack/projectmanager.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
import errno
import os
diff --git a/elbepack/repomanager.py b/elbepack/repomanager.py
index 1718f849cf..dc32b06320 100644
--- a/elbepack/repomanager.py
+++ b/elbepack/repomanager.py
@@ -1,11 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Andreas Messerschmid <andreas at linutronix.de>
-# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import os
import shutil
diff --git a/elbepack/rfs.py b/elbepack/rfs.py
index 6974e2d69a..6c505786fe 100644
--- a/elbepack/rfs.py
+++ b/elbepack/rfs.py
@@ -1,11 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
-# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
+# SPDX-FileCopyrightText: 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
import os
import logging
diff --git a/elbepack/rpcaptcache.py b/elbepack/rpcaptcache.py
index 2177498fc7..b2765db54e 100644
--- a/elbepack/rpcaptcache.py
+++ b/elbepack/rpcaptcache.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Markus Kreidl <mkreidl at linutronix.de>
-# Copyright (c) 2014, 2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
import logging
import os
diff --git a/elbepack/shellhelper.py b/elbepack/shellhelper.py
index f8ee0b58a6..c275fae005 100644
--- a/elbepack/shellhelper.py
+++ b/elbepack/shellhelper.py
@@ -1,9 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
-# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
+# SPDX-FileCopyrightText: 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
import os
import logging
diff --git a/elbepack/soapclient.py b/elbepack/soapclient.py
index 5203e198f0..ba1ad2121a 100644
--- a/elbepack/soapclient.py
+++ b/elbepack/soapclient.py
@@ -1,10 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2015-2016, 2018 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2016 Claudius Heine <ch at denx.de>
-# Copyright (c) 2017 Philipp Arras <philipp.arras at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2018 Linutronix GmbH
+# SPDX-FileCopyrightText: 2016 Claudius Heine <ch at denx.de>
import binascii
import logging
diff --git a/elbepack/templates.py b/elbepack/templates.py
index 4d1ced257f..94517785dd 100644
--- a/elbepack/templates.py
+++ b/elbepack/templates.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import os
diff --git a/elbepack/tests/test_doctest.py b/elbepack/tests/test_doctest.py
index 58c2143260..a875e871a5 100644
--- a/elbepack/tests/test_doctest.py
+++ b/elbepack/tests/test_doctest.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2020 Olivier Dion <dion at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2020 Linutronix GmbH
import doctest
diff --git a/elbepack/tests/test_efilesystem.py b/elbepack/tests/test_efilesystem.py
index 57305ad8c0..a62519f9a7 100644
--- a/elbepack/tests/test_efilesystem.py
+++ b/elbepack/tests/test_efilesystem.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2020 Olivier Dion <dion at linutronix.de>
-# Copyright (c) 2020 Torben Hohn <torbenh at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2020 Linutronix GmbH
import unittest
diff --git a/elbepack/tests/test_preproc.py b/elbepack/tests/test_preproc.py
index 87ed1dd4ad..54cdde5f1a 100644
--- a/elbepack/tests/test_preproc.py
+++ b/elbepack/tests/test_preproc.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2020 Olivier Dion <dion at linutronix.de>
-# Copyright (c) 2021 Torben Hohn <torben.hohn at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2020-2021 Linutronix GmbH
import os
import sys
diff --git a/elbepack/tests/test_pylint.py b/elbepack/tests/test_pylint.py
index 72de49156c..cf16cb79a9 100644
--- a/elbepack/tests/test_pylint.py
+++ b/elbepack/tests/test_pylint.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2020 Olivier Dion <dion at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2020 Linutronix GmbH
import os
diff --git a/elbepack/tests/test_version.py b/elbepack/tests/test_version.py
index 6442f85ead..77a71c711a 100644
--- a/elbepack/tests/test_version.py
+++ b/elbepack/tests/test_version.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2020 Olivier Dion <dion at linutronix.de>
-# Copyright (c) 2020 Torben Hohn <torbenh at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2020 Linutronix GmbH
import unittest
diff --git a/elbepack/tests/test_xml.py b/elbepack/tests/test_xml.py
index 7efd62da99..980e435177 100644
--- a/elbepack/tests/test_xml.py
+++ b/elbepack/tests/test_xml.py
@@ -1,7 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2020 Olivier Dion <dion at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2020 Linutronix GmbH
import os
import sys
diff --git a/elbepack/toolchain.py b/elbepack/toolchain.py
index fd24286356..d42fe37886 100644
--- a/elbepack/toolchain.py
+++ b/elbepack/toolchain.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
import string
diff --git a/elbepack/treeutils.py b/elbepack/treeutils.py
index 6e9b59a2f9..5c7d14efc9 100644
--- a/elbepack/treeutils.py
+++ b/elbepack/treeutils.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2017 Linutronix GmbH
import copy
diff --git a/elbepack/updated.py b/elbepack/updated.py
index 3f99168a91..36c3cb8311 100644
--- a/elbepack/updated.py
+++ b/elbepack/updated.py
@@ -1,12 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014 Andreas Messerschmid <andreas at linutronix.de>
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2015 Ferdinand Schwenk <ferdinand at ping.lan>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2015, 2017 Linutronix GmbH
+# SPDX-FileCopyrightText: 2015 Ferdinand Schwenk <ferdinand at ping.lan>
import errno
import os
diff --git a/elbepack/updated_monitors.py b/elbepack/updated_monitors.py
index f1d237b44a..3d2385c0b5 100644
--- a/elbepack/updated_monitors.py
+++ b/elbepack/updated_monitors.py
@@ -1,8 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2015 Ferdinand Schwenk <ferdinand at ping.lan>
-# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2015 Ferdinand Schwenk <ferdinand at ping.lan>
+# SPDX-FileCopyrightText: 2015, 2017 Linutronix GmbH
import os
import threading
diff --git a/elbepack/updatepkg.py b/elbepack/updatepkg.py
index 1cb9cfaab0..68b32a384b 100644
--- a/elbepack/updatepkg.py
+++ b/elbepack/updatepkg.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Stefan Gast <stefan.gast at linutronix.de>
-# Copyright (c) 2014-2015, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2015, 2017 Linutronix GmbH
import os
import logging
diff --git a/elbepack/validate.py b/elbepack/validate.py
index 93f4ea2fb8..c8b297281d 100644
--- a/elbepack/validate.py
+++ b/elbepack/validate.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
import os
import sys
diff --git a/elbepack/version.py b/elbepack/version.py
index d2f864021f..5eae9dc5b2 100644
--- a/elbepack/version.py
+++ b/elbepack/version.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2017-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2015 Torben Hohn <torbenh at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2018 Linutronix GmbH
from elbepack.directories import pack_dir
diff --git a/elbepack/virtapt.py b/elbepack/virtapt.py
index 9703493186..cb1ca7d89e 100644
--- a/elbepack/virtapt.py
+++ b/elbepack/virtapt.py
@@ -1,10 +1,7 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014-2015, 2018 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2018 John Ogness <john.ogness at linutronix.de>
-# Copyright (c) 2018 Oliver Brandt <oliver.brandt at lenze.com>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2018 Linutronix GmbH
+# SPDX-FileCopyrightText: 2018 Oliver Brandt <oliver.brandt at lenze.com>
import os
import sys
diff --git a/elbepack/xmldefaults.py b/elbepack/xmldefaults.py
index 888b8886d8..603932728b 100644
--- a/elbepack/xmldefaults.py
+++ b/elbepack/xmldefaults.py
@@ -1,10 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013-2014, 2016 Torben Hohn <torben.hohn at linutronix.de>
-# Copyright (c) 2014, 2017-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Sebastian Andrzej Siewior <bigeasy at linutronix.de>
-# Copyright (c) 2016 Anna-Maria Gleixner <anna-maria at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2018 Linutronix GmbH
import random
diff --git a/elbepack/xmlpreprocess.py b/elbepack/xmlpreprocess.py
index 245cb3d245..1e870430d3 100644
--- a/elbepack/xmlpreprocess.py
+++ b/elbepack/xmlpreprocess.py
@@ -1,9 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2017 Benedikt Spranger <b.spranger at linutronix.de>
-# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2018 Torben Hohn <torbenh at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2017-2018 Linutronix GmbH
import logging
import os
diff --git a/elbepack/xsdtoasciidoc.mako b/elbepack/xsdtoasciidoc.mako
index 46f0fd4e77..e41ef3a86a 100644
--- a/elbepack/xsdtoasciidoc.mako
+++ b/elbepack/xsdtoasciidoc.mako
@@ -1,7 +1,7 @@
## ELBE - Debian Based Embedded Rootfilesystem Builder
-## Copyright (c) 2013, 2017 Manuel Traut <manut at linutronix.de>
-##
## SPDX-License-Identifier: GPL-3.0-or-later
+## SPDX-FileCopyrightText: 2013, 2017 Linutronix GmbH
+
<%
import string
ELEM = "{http://www.w3.org/2001/XMLSchema}element"
diff --git a/elbepack/ziparchives.py b/elbepack/ziparchives.py
index a2b0b25967..e3efc25f20 100644
--- a/elbepack/ziparchives.py
+++ b/elbepack/ziparchives.py
@@ -1,8 +1,6 @@
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
from zipfile import ZipFile, ZipInfo, ZIP_DEFLATED
import os
diff --git a/setup.py b/setup.py
index 10a1123ca8..5c24db8527 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,8 @@
#!/usr/bin/env python3
#
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2013, 2017-2018 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2014 Sebastian Andrzej Siewior <bigeasy at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2013-2014, 2017-2018 Linutronix GmbH
import subprocess
import os
diff --git a/test/updated.py b/test/updated.py
index eb244ab949..7395ed3b2f 100755
--- a/test/updated.py
+++ b/test/updated.py
@@ -1,10 +1,8 @@
#!/usr/bin/env python3
#
# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
-# Copyright (c) 2017 Kurt Kanzenbach <kurt at linutronix.de>
-#
# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText: 2014, 2017 Linutronix GmbH
import sys
import threading
diff --git a/tests/pbuilder-amd64.xml b/tests/pbuilder-amd64.xml
index aa602b38b1..7d385d156b 100644
--- a/tests/pbuilder-amd64.xml
+++ b/tests/pbuilder-amd64.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
created="2009-05-20T08:50:56" revision="6"
diff --git a/tests/preproc-01.xml b/tests/preproc-01.xml
index ba594188d5..30fd0e28dc 100644
--- a/tests/preproc-01.xml
+++ b/tests/preproc-01.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xi="http://www.w3.org/2003/XInclude"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/tests/preproc-02.xml b/tests/preproc-02.xml
index 4220fff6fc..1a03b3320c 100644
--- a/tests/preproc-02.xml
+++ b/tests/preproc-02.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xi="http://www.w3.org/2003/XInclude"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/tests/simple-amd64-bookworm.xml b/tests/simple-amd64-bookworm.xml
index fe2c31a73e..9d9005e07d 100644
--- a/tests/simple-amd64-bookworm.xml
+++ b/tests/simple-amd64-bookworm.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
created="2009-05-20T08:50:56" revision="6"
diff --git a/tests/simple-amd64-with-grub-uefi.xml b/tests/simple-amd64-with-grub-uefi.xml
index cbe9b99d46..0617f24ba3 100644
--- a/tests/simple-amd64-with-grub-uefi.xml
+++ b/tests/simple-amd64-with-grub-uefi.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem
xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" created="2009-05-20T08:50:56" revision="6"
diff --git a/tests/simple-amd64-with-grub.xml b/tests/simple-amd64-with-grub.xml
index 5ad3102978..eb0421cb6a 100644
--- a/tests/simple-amd64-with-grub.xml
+++ b/tests/simple-amd64-with-grub.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
created="2009-05-20T08:50:56" revision="6"
diff --git a/tests/simple-arm64.xml b/tests/simple-arm64.xml
index cdca7e20c0..e42a2bd948 100644
--- a/tests/simple-arm64.xml
+++ b/tests/simple-arm64.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
created="2009-05-20T08:50:56" revision="6"
diff --git a/tests/simple-armhf.xml b/tests/simple-armhf.xml
index f5f3e2c300..be0b158889 100644
--- a/tests/simple-armhf.xml
+++ b/tests/simple-armhf.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
created="2009-05-20T08:50:56" revision="6"
diff --git a/tests/xinclude/simple.xml b/tests/xinclude/simple.xml
index 334e122f44..bebe8b59c4 100644
--- a/tests/xinclude/simple.xml
+++ b/tests/xinclude/simple.xml
@@ -1,3 +1,7 @@
+<!--
+SPDX-License-Identifier: GPL-3.0-or-later
+SPDX-FileCopyrightText: Linutronix GmbH
+-->
<ns0:RootFileSystem xmlns:ns0="https://www.linutronix.de/projects/Elbe"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
created="2009-05-20T08:50:56" revision="6"
--
2.39.2
More information about the elbe-devel
mailing list