From d8aaa71699bd73cdfd9a8c9043c1ded28b6074b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 12:02:07 +0200 Subject: [PATCH 01/10] licensing: say that our github docs are LGPLv2.1+ This mirros what 0aff7b7584 did for docs/. --- .github/ISSUE_TEMPLATE/Bug_report.md | 2 +- .github/ISSUE_TEMPLATE/Feature_request.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index ca8213863c..8eb40d4339 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -1,7 +1,7 @@ --- name: Bug report about: A report of an error in a recent systemd version - +SPDX-License-Identifier: LGPL-2.1-or-later --- **systemd version the issue has been seen with** diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md index 3c53d728d8..ad9f447f65 100644 --- a/.github/ISSUE_TEMPLATE/Feature_request.md +++ b/.github/ISSUE_TEMPLATE/Feature_request.md @@ -1,7 +1,7 @@ --- name: Feature request about: Suggest an improvement - +SPDX-License-Identifier: LGPL-2.1-or-later --- **Is your feature request related to a problem? Please describe.** From 43d6fcc09f6dd48e235ee5091dc2e60c6c074ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 12:09:20 +0200 Subject: [PATCH 02/10] github: use the same headers on yaml files Also adjust the mention of location of mkosi files, follow-up for d55ad7fe96eb1edf438a7a41a465723bd29d4b10. --- .github/workflows/labeler.yml | 4 ++++ .github/workflows/linter.yml | 2 +- .github/workflows/mkosi.yml | 7 ++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 76d67a3a5c..0a1df92264 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,4 +1,8 @@ +--- +# vi: ts=2 sw=2 et: +# name: "Pull Request Labeler" + on: - pull_request_target diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 115f5c7e0e..f4e7f18d52 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -1,6 +1,6 @@ --- +# vi: ts=2 sw=2 et: # https://github.com/marketplace/actions/super-linter - name: Lint Code Base on: diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 6c60154360..5df3b60c99 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -1,7 +1,8 @@ +--- +# vi: ts=2 sw=2 et: +# Simple boot tests that build and boot the mkosi images generated by the mkosi config files in mkosi.default.d/. name: mkosi -# Simple boot tests that build and boot the mkosi images generated by the mkosi config files in .mkosi. - on: push: branches: @@ -31,7 +32,7 @@ jobs: run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect python3-jinja2 - name: Configure - run: echo -e "[Distribution]\nDistribution=${{ matrix.distro }}\n" > mkosi.default + run: echo -e "[Distribution]\nDistribution=${{ matrix.distro }}\n" >mkosi.default # Ubuntu's systemd-nspawn doesn't support faccessat2() syscall, which is # required, since current Arch's glibc implements faccessat() via faccessat2(). From 186b9041ae628725e24b418341afb869741c1935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 12:10:22 +0200 Subject: [PATCH 03/10] ci: use LGPLv2+ for all our ci configuration --- .github/labeler.yml | 2 ++ .github/workflows/build_test.sh | 1 + .github/workflows/build_test.yml | 1 + .github/workflows/cifuzz.yml | 1 + .github/workflows/coverity.yml | 1 + .github/workflows/labeler.yml | 1 + .github/workflows/linter.yml | 1 + .github/workflows/mkosi.yml | 1 + .github/workflows/unit_tests.sh | 1 + .github/workflows/unit_tests.yml | 1 + .semaphore/semaphore-runner.sh | 1 + .semaphore/semaphore.yml | 1 + coccinelle/run-coccinelle.sh | 1 + 13 files changed, 14 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 773d575004..7d128f42d6 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + hwdb: - hwdb.d/**/* units: diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 57df14e2fc..89d2f85cfb 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -1,4 +1,5 @@ #!/bin/bash +# SPDX-License-Identifier: LGPL-2.1-or-later set -ex diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 3bb0cbddb2..763a9b8025 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -1,5 +1,6 @@ --- # vi: ts=2 sw=2 et: +# SPDX-License-Identifier: LGPL-2.1-or-later # name: Build test on: diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index 14d81a67ff..562f296399 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -1,5 +1,6 @@ --- # vi: ts=2 sw=2 et: +# SPDX-License-Identifier: LGPL-2.1-or-later # See: https://google.github.io/oss-fuzz/getting-started/continuous-integration/ name: CIFuzz diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index a0eb0f01fd..7581335a49 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -1,5 +1,6 @@ --- # vi: ts=2 sw=2 et: +# SPDX-License-Identifier: LGPL-2.1-or-later # name: Coverity diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 0a1df92264..aad5d2157f 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,5 +1,6 @@ --- # vi: ts=2 sw=2 et: +# SPDX-License-Identifier: LGPL-2.1-or-later # name: "Pull Request Labeler" diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index f4e7f18d52..1136c0523b 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -1,5 +1,6 @@ --- # vi: ts=2 sw=2 et: +# SPDX-License-Identifier: LGPL-2.1-or-later # https://github.com/marketplace/actions/super-linter name: Lint Code Base diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 5df3b60c99..9ae40e316f 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -1,5 +1,6 @@ --- # vi: ts=2 sw=2 et: +# SPDX-License-Identifier: LGPL-2.1-or-later # Simple boot tests that build and boot the mkosi images generated by the mkosi config files in mkosi.default.d/. name: mkosi diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh index bc5050fd1c..e1f7a4be1e 100755 --- a/.github/workflows/unit_tests.sh +++ b/.github/workflows/unit_tests.sh @@ -1,4 +1,5 @@ #!/bin/bash +# SPDX-License-Identifier: LGPL-2.1-or-later # shellcheck disable=SC2206 PHASES=(${@:-SETUP RUN RUN_ASAN_UBSAN CLEANUP}) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 9055716ef2..e697e6485d 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -1,5 +1,6 @@ --- # vi: ts=2 sw=2 et: +# SPDX-License-Identifier: LGPL-2.1-or-later # name: Unit tests on: diff --git a/.semaphore/semaphore-runner.sh b/.semaphore/semaphore-runner.sh index a0a4153cde..381504fd3b 100755 --- a/.semaphore/semaphore-runner.sh +++ b/.semaphore/semaphore-runner.sh @@ -1,4 +1,5 @@ #!/bin/bash +# SPDX-License-Identifier: LGPL-2.1-or-later set -eux set -o pipefail diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 06f162007e..bd5d135e9e 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -1,4 +1,5 @@ --- +# SPDX-License-Identifier: LGPL-2.1-or-later # vi: ts=2 sw=2 et: version: v1.0 diff --git a/coccinelle/run-coccinelle.sh b/coccinelle/run-coccinelle.sh index e7a6d51f49..becb38bf91 100755 --- a/coccinelle/run-coccinelle.sh +++ b/coccinelle/run-coccinelle.sh @@ -1,4 +1,5 @@ #!/bin/bash -e +# SPDX-License-Identifier: LGPL-2.1-or-later # Exclude following paths from the Coccinelle transformations EXCLUDED_PATHS=( From 6f2c7dd7cd1c39f48667d33058d209047b7df842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 12:19:43 +0200 Subject: [PATCH 04/10] licensing: add missing license headers on translation files Also make the headers more alike for consistency. --- po/fi.po | 6 +++--- po/kab.po | 6 +++--- po/nl.po | 6 +++--- po/pt.po | 6 +++--- po/si.po | 6 +++--- po/sr.po | 3 +-- po/systemd.pot | 5 +---- po/uk.po | 1 + po/zh_CN.po | 1 - 9 files changed, 18 insertions(+), 22 deletions(-) diff --git a/po/fi.po b/po/fi.po index 30d03c3826..3443e62a7f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,6 +1,6 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the systemd package. +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Finnish translation of systemd. # Jan Kuparinen , 2021. msgid "" msgstr "" diff --git a/po/kab.po b/po/kab.po index 8f6626a8d4..dc5f591781 100644 --- a/po/kab.po +++ b/po/kab.po @@ -1,6 +1,6 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the systemd package. +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Kabyle translation of systemd. # Slimane Selyan Amiri , 2021. msgid "" msgstr "" diff --git a/po/nl.po b/po/nl.po index efd7f244e7..f430603a6a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,6 +1,6 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the systemd package. +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Dutch translation of systemd. # Pjotr Vertaalt , 2021. msgid "" msgstr "" diff --git a/po/pt.po b/po/pt.po index 9176dc5315..089cd7c552 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,6 +1,6 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the systemd package. +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Portuguese translation of systemd. # Hugo Carvalho , 2021. msgid "" msgstr "" diff --git a/po/si.po b/po/si.po index 18eec40018..8c9e870cfa 100644 --- a/po/si.po +++ b/po/si.po @@ -1,6 +1,6 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the systemd package. +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Sinhala translation of systemd. # Hela Basa , 2021. msgid "" msgstr "" diff --git a/po/sr.po b/po/sr.po index 0f0094594a..df2f59d46f 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later # -# SOME DESCRIPTIVE TITLE. -# This file is distributed under the same license as the PACKAGE package. +# Serbian translation of systemd. # Frantisek Sumsal , 2021. msgid "" msgstr "" diff --git a/po/systemd.pot b/po/systemd.pot index 1c5ed6f04f..8e900b0d7c 100644 --- a/po/systemd.pot +++ b/po/systemd.pot @@ -1,7 +1,4 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the systemd package. -# FIRST AUTHOR , YEAR. +# SPDX-License-Identifier: LGPL-2.1-or-later # #, fuzzy msgid "" diff --git a/po/uk.po b/po/uk.po index b628f6c57a..6343db3a8f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,4 +1,5 @@ # SPDX-License-Identifier: LGPL-2.1-or-later +# # Ukrainian translation for systemd. # Eugene Melnik , 2014. # Daniel Korostil , 2014, 2016, 2018. diff --git a/po/zh_CN.po b/po/zh_CN.po index f568693228..2b5f3969aa 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later # # Simplified Chinese translation for systemd. -# # Frank Hill , 2014. # Boyuan Yang <073plan@gmail.com>, 2015. # Jeff Bai , 2016. From ed77c2de1fc4918a2dfb2be2ae364a32348d7a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 12:21:09 +0200 Subject: [PATCH 05/10] licensing: add header to POTFILES.in This is just a stupid file list, but without the header the file shows up on the list of files without a header. I checked that 'systemd-update-po' still works, so I think it's OK to add this. --- po/POTFILES.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 0346a19c82..e045852443 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + src/core/org.freedesktop.systemd1.policy.in src/home/org.freedesktop.home1.policy src/hostname/org.freedesktop.hostname1.policy From 64b92d637c7bc22b22463f35722f1b63b2db11b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 12:28:36 +0200 Subject: [PATCH 06/10] licensing: add spdx to our .cocci files Since those are chunks of code based on our codebase, it's easiest to use the same license. --- coccinelle/bool-cast.cocci | 1 + coccinelle/close-above-stdio.cocci | 1 + coccinelle/cmp.cocci | 1 + coccinelle/const-strlen.disabled | 1 + coccinelle/debug-logging.cocci | 1 + coccinelle/div-round-up.cocci | 1 + coccinelle/dup-fcntl.cocci | 1 + coccinelle/empty-or-dash.cocci | 1 + coccinelle/empty-or-root.cocci | 1 + coccinelle/empty-to-null.cocci | 1 + coccinelle/empty-to-root.cocci | 1 + coccinelle/enotsup.cocci | 1 + coccinelle/equals-null.cocci | 1 + coccinelle/errno-check.cocci | 1 + coccinelle/errno.cocci | 1 + coccinelle/exit-0.cocci | 1 + coccinelle/flags-set.cocci | 1 + coccinelle/fopen-unlocked.cocci | 1 + coccinelle/free_and_replace.cocci | 1 + coccinelle/hashmap_free.cocci | 1 + coccinelle/htonl.cocci | 1 + coccinelle/in_set.cocci | 1 + coccinelle/iovec-make.cocci | 1 + coccinelle/isempty.cocci | 1 + coccinelle/log-json.cocci | 1 + coccinelle/macros.h | 4 +++- coccinelle/malloc_multiply.cocci | 1 + coccinelle/memzero.cocci | 1 + coccinelle/mfree.cocci | 1 + coccinelle/mfree_return.cocci | 1 + coccinelle/no-if-assignments.cocci | 1 + coccinelle/not_in_set.cocci | 1 + coccinelle/o-ndelay.cocci | 1 + coccinelle/reallocarray.cocci | 1 + coccinelle/redundant-if.cocci | 1 + coccinelle/safe_close-no-if.cocci | 1 + coccinelle/safe_close.cocci | 1 + coccinelle/safe_closedir.cocci | 1 + coccinelle/safe_fclose.cocci | 1 + coccinelle/sd_event_source_disable_unref.cocci | 1 + coccinelle/set_ensure_put.cocci | 1 + coccinelle/strempty.cocci | 1 + coccinelle/strjoin.cocci | 1 + coccinelle/strjoina.cocci | 1 + coccinelle/strv_free.cocci | 1 + coccinelle/swap-two.cocci | 1 + coccinelle/synthetic-errno.cocci | 1 + coccinelle/take-fd.cocci | 1 + coccinelle/take-ptr.cocci | 1 + coccinelle/while-true.cocci | 1 + coccinelle/xsprintf.cocci | 1 + coccinelle/zz-drop-braces.cocci | 1 + 52 files changed, 54 insertions(+), 1 deletion(-) diff --git a/coccinelle/bool-cast.cocci b/coccinelle/bool-cast.cocci index 051ccb9417..a3311f0659 100644 --- a/coccinelle/bool-cast.cocci +++ b/coccinelle/bool-cast.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ bool b; expression y; diff --git a/coccinelle/close-above-stdio.cocci b/coccinelle/close-above-stdio.cocci index 44b3b1c9f1..93a0a85978 100644 --- a/coccinelle/close-above-stdio.cocci +++ b/coccinelle/close-above-stdio.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression fd; @@ diff --git a/coccinelle/cmp.cocci b/coccinelle/cmp.cocci index a34cbe5bf6..d5ab0f245e 100644 --- a/coccinelle/cmp.cocci +++ b/coccinelle/cmp.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression x, y; @@ diff --git a/coccinelle/const-strlen.disabled b/coccinelle/const-strlen.disabled index 30a6e5a88e..8b1a635274 100644 --- a/coccinelle/const-strlen.disabled +++ b/coccinelle/const-strlen.disabled @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ constant s; @@ diff --git a/coccinelle/debug-logging.cocci b/coccinelle/debug-logging.cocci index a679dab011..2885350f85 100644 --- a/coccinelle/debug-logging.cocci +++ b/coccinelle/debug-logging.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ @@ ( diff --git a/coccinelle/div-round-up.cocci b/coccinelle/div-round-up.cocci index a0c6df9801..609ec879d3 100644 --- a/coccinelle/div-round-up.cocci +++ b/coccinelle/div-round-up.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression x, y; @@ diff --git a/coccinelle/dup-fcntl.cocci b/coccinelle/dup-fcntl.cocci index 8b133b3a24..2c87f70dc3 100644 --- a/coccinelle/dup-fcntl.cocci +++ b/coccinelle/dup-fcntl.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ /* We want to stick with dup() in test-fd-util.c */ position p : script:python() { p[0].file != "src/test/test-fd-util.c" }; diff --git a/coccinelle/empty-or-dash.cocci b/coccinelle/empty-or-dash.cocci index bebaead2ff..56246affaa 100644 --- a/coccinelle/empty-or-dash.cocci +++ b/coccinelle/empty-or-dash.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression s; @@ diff --git a/coccinelle/empty-or-root.cocci b/coccinelle/empty-or-root.cocci index bf2f614da6..d36f0c8b1b 100644 --- a/coccinelle/empty-or-root.cocci +++ b/coccinelle/empty-or-root.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression s; @@ diff --git a/coccinelle/empty-to-null.cocci b/coccinelle/empty-to-null.cocci index bc6c656e79..1cc89475a6 100644 --- a/coccinelle/empty-to-null.cocci +++ b/coccinelle/empty-to-null.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ /* Avoid running this transformation on the empty_to_null function itself */ position p : script:python() { p[0].current_element != "empty_to_null" }; diff --git a/coccinelle/empty-to-root.cocci b/coccinelle/empty-to-root.cocci index 3720497bef..9a65a6936f 100644 --- a/coccinelle/empty-to-root.cocci +++ b/coccinelle/empty-to-root.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression s; @@ diff --git a/coccinelle/enotsup.cocci b/coccinelle/enotsup.cocci index c65734d382..47ac4b748b 100644 --- a/coccinelle/enotsup.cocci +++ b/coccinelle/enotsup.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ @@ - ENOTSUP diff --git a/coccinelle/equals-null.cocci b/coccinelle/equals-null.cocci index 3fce0f4caa..92c7054013 100644 --- a/coccinelle/equals-null.cocci +++ b/coccinelle/equals-null.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression e; statement s; diff --git a/coccinelle/errno-check.cocci b/coccinelle/errno-check.cocci index 709cb4ace6..f6f0071cd1 100644 --- a/coccinelle/errno-check.cocci +++ b/coccinelle/errno-check.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ constant c; @@ diff --git a/coccinelle/errno.cocci b/coccinelle/errno.cocci index 4e594e7826..dd886ea493 100644 --- a/coccinelle/errno.cocci +++ b/coccinelle/errno.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ identifier log_LEVEL_errno =~ "^log_(debug|info|notice|warning|error|emergency)_errno$"; local idexpression r; diff --git a/coccinelle/exit-0.cocci b/coccinelle/exit-0.cocci index 8b81600579..ff3d965a9d 100644 --- a/coccinelle/exit-0.cocci +++ b/coccinelle/exit-0.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ @@ - exit(0); diff --git a/coccinelle/flags-set.cocci b/coccinelle/flags-set.cocci index 22620f1849..bcf08db23b 100644 --- a/coccinelle/flags-set.cocci +++ b/coccinelle/flags-set.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ /* Disable this transformation in cases where it doesn't make sense or * where it makes the resulting expression more confusing diff --git a/coccinelle/fopen-unlocked.cocci b/coccinelle/fopen-unlocked.cocci index 7870f8ccea..1caa698c7b 100644 --- a/coccinelle/fopen-unlocked.cocci +++ b/coccinelle/fopen-unlocked.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression f, path, options; @@ diff --git a/coccinelle/free_and_replace.cocci b/coccinelle/free_and_replace.cocci index 9dcdbf4d42..7d8b6a738c 100644 --- a/coccinelle/free_and_replace.cocci +++ b/coccinelle/free_and_replace.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression p, q; @@ diff --git a/coccinelle/hashmap_free.cocci b/coccinelle/hashmap_free.cocci index 86b9542488..31e1279ac0 100644 --- a/coccinelle/hashmap_free.cocci +++ b/coccinelle/hashmap_free.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression p; @@ diff --git a/coccinelle/htonl.cocci b/coccinelle/htonl.cocci index 4e69bb7090..c247d24e9b 100644 --- a/coccinelle/htonl.cocci +++ b/coccinelle/htonl.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression s; @@ diff --git a/coccinelle/in_set.cocci b/coccinelle/in_set.cocci index 1c17c7df1f..8be786dc2d 100644 --- a/coccinelle/in_set.cocci +++ b/coccinelle/in_set.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Limit the number of expressions to 6 for performance reasons */ @@ expression e; diff --git a/coccinelle/iovec-make.cocci b/coccinelle/iovec-make.cocci index 7a0d4ced9b..79116882fc 100644 --- a/coccinelle/iovec-make.cocci +++ b/coccinelle/iovec-make.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression x, y, p, l; @@ diff --git a/coccinelle/isempty.cocci b/coccinelle/isempty.cocci index e0a9f07ca6..b1b9277270 100644 --- a/coccinelle/isempty.cocci +++ b/coccinelle/isempty.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ /* Disable this transformation for the test-string-util.c */ position p : script:python() { p[0].file != "src/test/test-string-util.c" }; diff --git a/coccinelle/log-json.cocci b/coccinelle/log-json.cocci index 3730fd6ea3..d184e56584 100644 --- a/coccinelle/log-json.cocci +++ b/coccinelle/log-json.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression e, v, flags; expression list args; diff --git a/coccinelle/macros.h b/coccinelle/macros.h index 62177f0d86..0be4aaea42 100644 --- a/coccinelle/macros.h +++ b/coccinelle/macros.h @@ -1,4 +1,6 @@ -/* Collected macros from our systemd codebase to make the cocci semantic +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Collected macros from our systemd codebase to make the cocci semantic * parser happy. Inspired by the original cocci macros file * /usr/lib64/coccinelle/standard.h (including the YACFE_* symbols) */ diff --git a/coccinelle/malloc_multiply.cocci b/coccinelle/malloc_multiply.cocci index 3284edf737..320d257bd9 100644 --- a/coccinelle/malloc_multiply.cocci +++ b/coccinelle/malloc_multiply.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression q, n, m; @@ diff --git a/coccinelle/memzero.cocci b/coccinelle/memzero.cocci index 8198cc84b4..90fa0ddef6 100644 --- a/coccinelle/memzero.cocci +++ b/coccinelle/memzero.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression s; @@ diff --git a/coccinelle/mfree.cocci b/coccinelle/mfree.cocci index 1389cd35db..191cd626f5 100644 --- a/coccinelle/mfree.cocci +++ b/coccinelle/mfree.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression p; @@ diff --git a/coccinelle/mfree_return.cocci b/coccinelle/mfree_return.cocci index 15e6c7d566..c2c4cb3209 100644 --- a/coccinelle/mfree_return.cocci +++ b/coccinelle/mfree_return.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ /* Avoid running this transformation on the mfree function itself */ position p : script:python() { p[0].current_element != "mfree" }; diff --git a/coccinelle/no-if-assignments.cocci b/coccinelle/no-if-assignments.cocci index 9f63e90337..9fbc018f11 100644 --- a/coccinelle/no-if-assignments.cocci +++ b/coccinelle/no-if-assignments.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression p, q; identifier r; diff --git a/coccinelle/not_in_set.cocci b/coccinelle/not_in_set.cocci index 3486cff5df..0840109502 100644 --- a/coccinelle/not_in_set.cocci +++ b/coccinelle/not_in_set.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* Limit the number of expressions to 6 for performance reasons */ @@ expression e; diff --git a/coccinelle/o-ndelay.cocci b/coccinelle/o-ndelay.cocci index 669424a054..8b7a150243 100644 --- a/coccinelle/o-ndelay.cocci +++ b/coccinelle/o-ndelay.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ @@ - O_NDELAY diff --git a/coccinelle/reallocarray.cocci b/coccinelle/reallocarray.cocci index 21fe9dfbfd..85a8b3bc38 100644 --- a/coccinelle/reallocarray.cocci +++ b/coccinelle/reallocarray.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression q, p, n, m; @@ diff --git a/coccinelle/redundant-if.cocci b/coccinelle/redundant-if.cocci index 515e36e151..6582d6373b 100644 --- a/coccinelle/redundant-if.cocci +++ b/coccinelle/redundant-if.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression r; @@ diff --git a/coccinelle/safe_close-no-if.cocci b/coccinelle/safe_close-no-if.cocci index 81c5678518..881ce1fa0a 100644 --- a/coccinelle/safe_close-no-if.cocci +++ b/coccinelle/safe_close-no-if.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression fd; @@ diff --git a/coccinelle/safe_close.cocci b/coccinelle/safe_close.cocci index 6fedd804f2..36a8537251 100644 --- a/coccinelle/safe_close.cocci +++ b/coccinelle/safe_close.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression fd; @@ diff --git a/coccinelle/safe_closedir.cocci b/coccinelle/safe_closedir.cocci index 743ffd97ef..8981825230 100644 --- a/coccinelle/safe_closedir.cocci +++ b/coccinelle/safe_closedir.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression p; @@ diff --git a/coccinelle/safe_fclose.cocci b/coccinelle/safe_fclose.cocci index 6961cd0164..fc1b584d88 100644 --- a/coccinelle/safe_fclose.cocci +++ b/coccinelle/safe_fclose.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression p; @@ diff --git a/coccinelle/sd_event_source_disable_unref.cocci b/coccinelle/sd_event_source_disable_unref.cocci index 2763fefac9..659aa00cf3 100644 --- a/coccinelle/sd_event_source_disable_unref.cocci +++ b/coccinelle/sd_event_source_disable_unref.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression p; @@ diff --git a/coccinelle/set_ensure_put.cocci b/coccinelle/set_ensure_put.cocci index 92d7970ade..cfcd77b7a1 100644 --- a/coccinelle/set_ensure_put.cocci +++ b/coccinelle/set_ensure_put.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ local idexpression r; expression p, k, x; diff --git a/coccinelle/strempty.cocci b/coccinelle/strempty.cocci index 0868184c5d..d36f092f63 100644 --- a/coccinelle/strempty.cocci +++ b/coccinelle/strempty.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ /* Avoid running this transformation on the strempty function itself and * on the "make_expression" macro in src/libsystemd/sd-bus/bus-convenience.c. diff --git a/coccinelle/strjoin.cocci b/coccinelle/strjoin.cocci index 46f70c4c23..1efff700b7 100644 --- a/coccinelle/strjoin.cocci +++ b/coccinelle/strjoin.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ position p : script:python() { p[0].current_element != "test_strjoin" }; expression t; diff --git a/coccinelle/strjoina.cocci b/coccinelle/strjoina.cocci index b209633480..891b22a204 100644 --- a/coccinelle/strjoina.cocci +++ b/coccinelle/strjoina.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ position p : script:python() { p[0].current_element != "test_strjoina" }; expression n, m; diff --git a/coccinelle/strv_free.cocci b/coccinelle/strv_free.cocci index 0ad56f772f..8eddfc566e 100644 --- a/coccinelle/strv_free.cocci +++ b/coccinelle/strv_free.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression p; @@ diff --git a/coccinelle/swap-two.cocci b/coccinelle/swap-two.cocci index edf7d32403..d80c4e0402 100644 --- a/coccinelle/swap-two.cocci +++ b/coccinelle/swap-two.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression x, y, z; @@ diff --git a/coccinelle/synthetic-errno.cocci b/coccinelle/synthetic-errno.cocci index dcae069f74..6826ea45da 100644 --- a/coccinelle/synthetic-errno.cocci +++ b/coccinelle/synthetic-errno.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ expression e; expression list args; diff --git a/coccinelle/take-fd.cocci b/coccinelle/take-fd.cocci index f7124e7896..396d6965c7 100644 --- a/coccinelle/take-fd.cocci +++ b/coccinelle/take-fd.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ local idexpression p; expression q; diff --git a/coccinelle/take-ptr.cocci b/coccinelle/take-ptr.cocci index 0cebe81575..3251d3ed65 100644 --- a/coccinelle/take-ptr.cocci +++ b/coccinelle/take-ptr.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ local idexpression p; expression q; diff --git a/coccinelle/while-true.cocci b/coccinelle/while-true.cocci index c23fb11f22..3ea70bc0c6 100644 --- a/coccinelle/while-true.cocci +++ b/coccinelle/while-true.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ statement s; @@ diff --git a/coccinelle/xsprintf.cocci b/coccinelle/xsprintf.cocci index 660a35e3f4..3b38090652 100644 --- a/coccinelle/xsprintf.cocci +++ b/coccinelle/xsprintf.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ position p : script:python() { not p[0].file.startswith("man/") }; expression e, fmt; diff --git a/coccinelle/zz-drop-braces.cocci b/coccinelle/zz-drop-braces.cocci index 34bf12fbea..8c3be01c1f 100644 --- a/coccinelle/zz-drop-braces.cocci +++ b/coccinelle/zz-drop-braces.cocci @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ @@ position p : script:python() { p[0].file != "src/journal/lookup3.c" }; identifier id; From 090ade7ee7a869ee840f09e1042dcbd151987814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 12:49:36 +0200 Subject: [PATCH 07/10] licensing: add spdx header to chromiumos helper, move license file It makes it easier to process the license automatically like other files. The text of the license in tools/chromiumos/LICENSE matches https://spdx.org/licenses/BSD-3-Clause.html exactly. --- tools/chromiumos/LICENSE => LICENSES/BSD-3-Clause.txt | 0 tools/chromiumos/gen_autosuspend_rules.py | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename tools/chromiumos/LICENSE => LICENSES/BSD-3-Clause.txt (100%) diff --git a/tools/chromiumos/LICENSE b/LICENSES/BSD-3-Clause.txt similarity index 100% rename from tools/chromiumos/LICENSE rename to LICENSES/BSD-3-Clause.txt diff --git a/tools/chromiumos/gen_autosuspend_rules.py b/tools/chromiumos/gen_autosuspend_rules.py index 6e167f60f0..cbdd577e95 100644 --- a/tools/chromiumos/gen_autosuspend_rules.py +++ b/tools/chromiumos/gen_autosuspend_rules.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: BSD-3-Clause # -*- coding: utf-8 -*- # Copyright 2017 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# found in the LICENSES/BSD-3-Clause.txt file. """Autosuspend udev rule generator From 098621aff34d31bf9b535d9deb5c144c8d79ebdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 12:54:06 +0200 Subject: [PATCH 08/10] licensing: add missing header to one .network file It should have the full header because it will be installed onto user systems like the other .network files. --- network/80-wifi-adhoc.network | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/network/80-wifi-adhoc.network b/network/80-wifi-adhoc.network index 8ca59dee25..c0c388f165 100644 --- a/network/80-wifi-adhoc.network +++ b/network/80-wifi-adhoc.network @@ -1,3 +1,12 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + [Match] Type=wlan WLANInterfaceType=ad-hoc From 8f5bcd615be7ca14d2375cd9099ad230508c9392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 13:04:32 +0200 Subject: [PATCH 09/10] licensing: add forgotten spdx headers Those are all "our" files, but we forgot to add the headers, most likely because of non-standard file extensions. --- man/custom-entities.ent.in | 1 + mkosi.build | 1 + shell-completion/zsh/_systemd-path | 1 + src/basic/missing_mount.h | 1 + src/basic/missing_securebits.h | 1 + src/login/systemd-user.in | 1 + src/rpm/systemd-update-helper.in | 1 + test/create-busybox-container | 1 + test/mkosi.build.networkd-test | 1 + test/mkosi.default.networkd-test | 2 ++ test/mkosi.nspawn.networkd-test | 2 ++ test/run-integration-tests.sh | 1 + test/run-unit-tests.py | 1 + test/test-efi-create-disk.sh | 1 + test/test-functions | 4 +++- test/test-network-generator-conversion.sh | 1 + test/test-sysusers.sh.in | 1 + test/udev-test.pl | 1 + 18 files changed, 22 insertions(+), 1 deletion(-) diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in index 76a3dace33..5c01ccb701 100644 --- a/man/custom-entities.ent.in +++ b/man/custom-entities.ent.in @@ -1,4 +1,5 @@ + diff --git a/mkosi.build b/mkosi.build index 1ed6815bf9..bb04d5edaa 100755 --- a/mkosi.build +++ b/mkosi.build @@ -1,4 +1,5 @@ #!/bin/sh +# SPDX-License-Identifier: LGPL-2.1-or-later set -e # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi). diff --git a/shell-completion/zsh/_systemd-path b/shell-completion/zsh/_systemd-path index dd2e720fd9..d1fb24b2fd 100644 --- a/shell-completion/zsh/_systemd-path +++ b/shell-completion/zsh/_systemd-path @@ -1,4 +1,5 @@ #compdef systemd-path +# SPDX-License-Identifier: LGPL-2.1-or-later typeset -A sdpath=( ${$(systemd-path)/:/} ) _arguments -S \ diff --git a/src/basic/missing_mount.h b/src/basic/missing_mount.h index c60acf041a..69b0bcfcbf 100644 --- a/src/basic/missing_mount.h +++ b/src/basic/missing_mount.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include diff --git a/src/basic/missing_securebits.h b/src/basic/missing_securebits.h index 40d6ec9d71..03fad6f503 100644 --- a/src/basic/missing_securebits.h +++ b/src/basic/missing_securebits.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once #include diff --git a/src/login/systemd-user.in b/src/login/systemd-user.in index 19e649bbe9..39bcbd71fe 100644 --- a/src/login/systemd-user.in +++ b/src/login/systemd-user.in @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later # This file is part of systemd. # # Used by systemd --user instances. diff --git a/src/rpm/systemd-update-helper.in b/src/rpm/systemd-update-helper.in index 0c6675a9db..fa35e7ba90 100755 --- a/src/rpm/systemd-update-helper.in +++ b/src/rpm/systemd-update-helper.in @@ -1,4 +1,5 @@ #!/bin/bash +# SPDX-License-Identifier: LGPL-2.1-or-later set -eu set -o pipefail diff --git a/test/create-busybox-container b/test/create-busybox-container index b6f34b47ec..05ab2b11c9 100755 --- a/test/create-busybox-container +++ b/test/create-busybox-container @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-2.1-or-later set -e set -u diff --git a/test/mkosi.build.networkd-test b/test/mkosi.build.networkd-test index cdaa4302f7..ea97d012fa 100755 --- a/test/mkosi.build.networkd-test +++ b/test/mkosi.build.networkd-test @@ -1,4 +1,5 @@ #!/bin/sh +# SPDX-License-Identifier: LGPL-2.1-or-later set -ex # First, source in the main build script diff --git a/test/mkosi.default.networkd-test b/test/mkosi.default.networkd-test index fc9a5d3134..6423417b81 100644 --- a/test/mkosi.default.networkd-test +++ b/test/mkosi.default.networkd-test @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# # Puts together an nspawn container and runs networkd-test.py in it, inside a # network namespace and everything. Run this with # diff --git a/test/mkosi.nspawn.networkd-test b/test/mkosi.nspawn.networkd-test index a23aed6eda..f624f241f3 100644 --- a/test/mkosi.nspawn.networkd-test +++ b/test/mkosi.nspawn.networkd-test @@ -1,2 +1,4 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + [Network] Private=yes diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh index 2b48417d58..89058f4aca 100755 --- a/test/run-integration-tests.sh +++ b/test/run-integration-tests.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-2.1-or-later set -e if [ "$NO_BUILD" ]; then diff --git a/test/run-unit-tests.py b/test/run-unit-tests.py index f4d290aa91..314182d980 100755 --- a/test/run-unit-tests.py +++ b/test/run-unit-tests.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: LGPL-2.1-or-later import argparse import glob diff --git a/test/test-efi-create-disk.sh b/test/test-efi-create-disk.sh index e0949ba729..46062e46e7 100755 --- a/test/test-efi-create-disk.sh +++ b/test/test-efi-create-disk.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-2.1-or-later set -eo pipefail out="${1:?}" diff --git a/test/test-functions b/test/test-functions index a9a01a80d0..31eb86f2bd 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1,6 +1,8 @@ #!/usr/bin/env bash -# shellcheck disable=SC2030,SC2031 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# shellcheck disable=SC2030,SC2031 # ex: ts=8 sw=4 sts=4 et filetype=sh tw=180 # Note: the shellcheck line above disables warning for variables which were # modified in a subshell. In our case this behavior is expected, but diff --git a/test/test-network-generator-conversion.sh b/test/test-network-generator-conversion.sh index da7f985dee..3b6b1ec8ba 100755 --- a/test/test-network-generator-conversion.sh +++ b/test/test-network-generator-conversion.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-2.1-or-later set -ex if [[ -n "$1" ]]; then diff --git a/test/test-sysusers.sh.in b/test/test-sysusers.sh.in index 6e133cc841..c9d9bd993b 100755 --- a/test/test-sysusers.sh.in +++ b/test/test-sysusers.sh.in @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-2.1-or-later set -e SYSUSERS="${1:-systemd-sysusers}" diff --git a/test/udev-test.pl b/test/udev-test.pl index 5c1b364848..3aeac65578 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -1,4 +1,5 @@ #!/usr/bin/env perl +# SPDX-License-Identifier: LGPL-2.1-or-later # udev test # From 0aee5e3dc0d560cb2bd5cfa743245c9a357a0063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 1 Oct 2021 13:05:51 +0200 Subject: [PATCH 10/10] xorg/50-systemd-user: add a full license header This file is installed onto user systems, so it should have the full header that says where it came from. --- xorg/50-systemd-user.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xorg/50-systemd-user.sh b/xorg/50-systemd-user.sh index bfee5f691c..fb03ecbec0 100755 --- a/xorg/50-systemd-user.sh +++ b/xorg/50-systemd-user.sh @@ -1,4 +1,12 @@ #!/bin/sh +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. systemctl --user import-environment DISPLAY XAUTHORITY