diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-05-23 18:27:31 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-05-23 18:27:31 +0000 |
commit | 0f68316eb3edbac52e75b0f281062f01511dd7ff (patch) | |
tree | 8fadbee6556442cd0f65c8382731e0ca82ea4951 /vm | |
parent | a1ec324a52fa9982a5a9fb45e15cb8bdffded518 (diff) | |
download | spectrum-0f68316eb3edbac52e75b0f281062f01511dd7ff.tar spectrum-0f68316eb3edbac52e75b0f281062f01511dd7ff.tar.gz spectrum-0f68316eb3edbac52e75b0f281062f01511dd7ff.tar.bz2 spectrum-0f68316eb3edbac52e75b0f281062f01511dd7ff.tar.lz spectrum-0f68316eb3edbac52e75b0f281062f01511dd7ff.tar.xz spectrum-0f68316eb3edbac52e75b0f281062f01511dd7ff.tar.zst spectrum-0f68316eb3edbac52e75b0f281062f01511dd7ff.zip |
Clarify EUPL SPDX expression
This isn't a license change — the code was always available under potential future EUPL versions because of this language in the EUPL: > Copyleft clause: If the Licensee distributes or communicates copies of the > Original Works or Derivative Works, this Distribution or Communication will be > done under the terms of this Licence or of a later version of this Licence > unless the Original Work is expressly distributed only under this version of the > Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee > (becoming Licensor) cannot offer or impose any additional terms or conditions on > the Work or Derivative Work that alter or restrict the terms of the Licence. But now that reuse 1.0.0 is out, and supports SPDX '+' expressions, we can express this more clearly in SPDX. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'vm')
29 files changed, 29 insertions, 29 deletions
diff --git a/vm/app/catgirl/Makefile b/vm/app/catgirl/Makefile index ea7dd60..a32826b 100644 --- a/vm/app/catgirl/Makefile +++ b/vm/app/catgirl/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> # qemu-kvm is non-standard, but is present in at least Fedora and diff --git a/vm/app/catgirl/etc/init b/vm/app/catgirl/etc/init index d67ecd1..6424e22 100755 --- a/vm/app/catgirl/etc/init +++ b/vm/app/catgirl/etc/init @@ -1,5 +1,5 @@ #!/bin/execlineb -s0 -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is> /bin/s6-linux-init -Bc /etc/s6-linux-init -- $@ diff --git a/vm/app/catgirl/etc/mdev.conf b/vm/app/catgirl/etc/mdev.conf index d441c68..f114719 100644 --- a/vm/app/catgirl/etc/mdev.conf +++ b/vm/app/catgirl/etc/mdev.conf @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> -$MODALIAS=.* 0:0 660 +importas -iu MODALIAS MODALIAS modprobe -q $MODALIAS diff --git a/vm/app/catgirl/etc/mdev/iface b/vm/app/catgirl/etc/mdev/iface index d711779..6d917fc 100755 --- a/vm/app/catgirl/etc/mdev/iface +++ b/vm/app/catgirl/etc/mdev/iface @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> importas -i INTERFACE INTERFACE diff --git a/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init b/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init index e205d8f..1016d0c 100755 --- a/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init +++ b/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2022 Alyssa Ross <hi@alyssa.is> if { s6-rc-init -c /etc/s6-rc /run/service } diff --git a/vm/app/catgirl/etc/s6-rc/catgirl/run b/vm/app/catgirl/etc/s6-rc/catgirl/run index c85a942..41ae0aa 100755 --- a/vm/app/catgirl/etc/s6-rc/catgirl/run +++ b/vm/app/catgirl/etc/s6-rc/catgirl/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> export TERM foot diff --git a/vm/app/catgirl/etc/s6-rc/mdevd-coldplug/up b/vm/app/catgirl/etc/s6-rc/mdevd-coldplug/up index a5d4dc1..8698f7d 100644 --- a/vm/app/catgirl/etc/s6-rc/mdevd-coldplug/up +++ b/vm/app/catgirl/etc/s6-rc/mdevd-coldplug/up @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> mdevd-coldplug diff --git a/vm/app/catgirl/etc/s6-rc/mdevd/run b/vm/app/catgirl/etc/s6-rc/mdevd/run index 03ad5e3..6dacb13 100644 --- a/vm/app/catgirl/etc/s6-rc/mdevd/run +++ b/vm/app/catgirl/etc/s6-rc/mdevd/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> mdevd -D3 diff --git a/vm/app/lynx/Makefile b/vm/app/lynx/Makefile index dcf3dec..c25c9ab 100644 --- a/vm/app/lynx/Makefile +++ b/vm/app/lynx/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> # qemu-kvm is non-standard, but is present in at least Fedora and diff --git a/vm/app/lynx/etc/init b/vm/app/lynx/etc/init index d67ecd1..6424e22 100755 --- a/vm/app/lynx/etc/init +++ b/vm/app/lynx/etc/init @@ -1,5 +1,5 @@ #!/bin/execlineb -s0 -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is> /bin/s6-linux-init -Bc /etc/s6-linux-init -- $@ diff --git a/vm/app/lynx/etc/mdev.conf b/vm/app/lynx/etc/mdev.conf index d441c68..f114719 100644 --- a/vm/app/lynx/etc/mdev.conf +++ b/vm/app/lynx/etc/mdev.conf @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> -$MODALIAS=.* 0:0 660 +importas -iu MODALIAS MODALIAS modprobe -q $MODALIAS diff --git a/vm/app/lynx/etc/mdev/iface b/vm/app/lynx/etc/mdev/iface index de4364e..eb91e33 100755 --- a/vm/app/lynx/etc/mdev/iface +++ b/vm/app/lynx/etc/mdev/iface @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> importas -i INTERFACE INTERFACE diff --git a/vm/app/lynx/etc/s6-linux-init/scripts/rc.init b/vm/app/lynx/etc/s6-linux-init/scripts/rc.init index e205d8f..1016d0c 100755 --- a/vm/app/lynx/etc/s6-linux-init/scripts/rc.init +++ b/vm/app/lynx/etc/s6-linux-init/scripts/rc.init @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2022 Alyssa Ross <hi@alyssa.is> if { s6-rc-init -c /etc/s6-rc /run/service } diff --git a/vm/app/lynx/etc/s6-rc/lynx/run b/vm/app/lynx/etc/s6-rc/lynx/run index 6a35782..d0e7a83 100755 --- a/vm/app/lynx/etc/s6-rc/lynx/run +++ b/vm/app/lynx/etc/s6-rc/lynx/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> export TERM foot diff --git a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/up b/vm/app/lynx/etc/s6-rc/mdevd-coldplug/up index a5d4dc1..8698f7d 100644 --- a/vm/app/lynx/etc/s6-rc/mdevd-coldplug/up +++ b/vm/app/lynx/etc/s6-rc/mdevd-coldplug/up @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> mdevd-coldplug diff --git a/vm/app/lynx/etc/s6-rc/mdevd/run b/vm/app/lynx/etc/s6-rc/mdevd/run index 03ad5e3..6dacb13 100644 --- a/vm/app/lynx/etc/s6-rc/mdevd/run +++ b/vm/app/lynx/etc/s6-rc/mdevd/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> mdevd -D3 diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 9dfa7c8..7cb7a5f 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> # qemu-kvm is non-standard, but is present in at least Fedora and diff --git a/vm/sys/net/etc/init b/vm/sys/net/etc/init index d67ecd1..6424e22 100755 --- a/vm/sys/net/etc/init +++ b/vm/sys/net/etc/init @@ -1,5 +1,5 @@ #!/bin/execlineb -s0 -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is> /bin/s6-linux-init -Bc /etc/s6-linux-init -- $@ diff --git a/vm/sys/net/etc/mdev.conf b/vm/sys/net/etc/mdev.conf index d441c68..f114719 100644 --- a/vm/sys/net/etc/mdev.conf +++ b/vm/sys/net/etc/mdev.conf @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> -$MODALIAS=.* 0:0 660 +importas -iu MODALIAS MODALIAS modprobe -q $MODALIAS diff --git a/vm/sys/net/etc/mdev/iface b/vm/sys/net/etc/mdev/iface index bac6116..b51a8f1 100755 --- a/vm/sys/net/etc/mdev/iface +++ b/vm/sys/net/etc/mdev/iface @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> importas -i INTERFACE INTERFACE diff --git a/vm/sys/net/etc/nftables.conf b/vm/sys/net/etc/nftables.conf index b3fa71f..296d92c 100644 --- a/vm/sys/net/etc/nftables.conf +++ b/vm/sys/net/etc/nftables.conf @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> table nat { diff --git a/vm/sys/net/etc/s6-linux-init/run-image/service/getty-hvc0/run b/vm/sys/net/etc/s6-linux-init/run-image/service/getty-hvc0/run index 2d2022c..a919fbe 100755 --- a/vm/sys/net/etc/s6-linux-init/run-image/service/getty-hvc0/run +++ b/vm/sys/net/etc/s6-linux-init/run-image/service/getty-hvc0/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> export TERM foot diff --git a/vm/sys/net/etc/s6-linux-init/scripts/rc.init b/vm/sys/net/etc/s6-linux-init/scripts/rc.init index e205d8f..1016d0c 100755 --- a/vm/sys/net/etc/s6-linux-init/scripts/rc.init +++ b/vm/sys/net/etc/s6-linux-init/scripts/rc.init @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2022 Alyssa Ross <hi@alyssa.is> if { s6-rc-init -c /etc/s6-rc /run/service } diff --git a/vm/sys/net/etc/s6-rc/connman/run b/vm/sys/net/etc/s6-rc/connman/run index 80e901b..0bed2ee 100644 --- a/vm/sys/net/etc/s6-rc/connman/run +++ b/vm/sys/net/etc/s6-rc/connman/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> if { modprobe af_packet } diff --git a/vm/sys/net/etc/s6-rc/dbus/run b/vm/sys/net/etc/s6-rc/dbus/run index eff0457..b452e92 100644 --- a/vm/sys/net/etc/s6-rc/dbus/run +++ b/vm/sys/net/etc/s6-rc/dbus/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> foreground { mkdir /run/dbus } diff --git a/vm/sys/net/etc/s6-rc/mdevd-coldplug/up b/vm/sys/net/etc/s6-rc/mdevd-coldplug/up index a5d4dc1..8698f7d 100644 --- a/vm/sys/net/etc/s6-rc/mdevd-coldplug/up +++ b/vm/sys/net/etc/s6-rc/mdevd-coldplug/up @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> mdevd-coldplug diff --git a/vm/sys/net/etc/s6-rc/mdevd/run b/vm/sys/net/etc/s6-rc/mdevd/run index 03ad5e3..6dacb13 100644 --- a/vm/sys/net/etc/s6-rc/mdevd/run +++ b/vm/sys/net/etc/s6-rc/mdevd/run @@ -1,5 +1,5 @@ #!/bin/execlineb -P -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> mdevd -D3 diff --git a/vm/sys/net/etc/s6-rc/nftables/up b/vm/sys/net/etc/s6-rc/nftables/up index fbab700..7d5f141 100644 --- a/vm/sys/net/etc/s6-rc/nftables/up +++ b/vm/sys/net/etc/s6-rc/nftables/up @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> if { modprobe nft_chain_nat } diff --git a/vm/sys/net/etc/s6-rc/sysctl/up b/vm/sys/net/etc/s6-rc/sysctl/up index 0b88138..dafa493 100644 --- a/vm/sys/net/etc/s6-rc/sysctl/up +++ b/vm/sys/net/etc/s6-rc/sysctl/up @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: EUPL-1.2 +# SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> sysctl -pq |