summary refs log tree commit diff
path: root/host/rootfs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-05-23 18:27:31 +0000
committerAlyssa Ross <hi@alyssa.is>2022-05-23 18:27:31 +0000
commit0f68316eb3edbac52e75b0f281062f01511dd7ff (patch)
tree8fadbee6556442cd0f65c8382731e0ca82ea4951 /host/rootfs
parenta1ec324a52fa9982a5a9fb45e15cb8bdffded518 (diff)
downloadspectrum-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 'host/rootfs')
-rw-r--r--host/rootfs/Makefile2
-rwxr-xr-xhost/rootfs/etc/init2
-rwxr-xr-xhost/rootfs/etc/login2
-rw-r--r--host/rootfs/etc/mdev.conf2
-rwxr-xr-xhost/rootfs/etc/mdev/block/add2
-rwxr-xr-xhost/rootfs/etc/mdev/listen2
-rwxr-xr-xhost/rootfs/etc/mdev/net/add2
-rwxr-xr-xhost/rootfs/etc/mdev/wait2
-rwxr-xr-xhost/rootfs/etc/parse-devname2
-rwxr-xr-xhost/rootfs/etc/s6-linux-init/run-image/service/getty-tty1/run2
-rwxr-xr-xhost/rootfs/etc/s6-linux-init/run-image/service/getty-tty2/run2
-rwxr-xr-xhost/rootfs/etc/s6-linux-init/run-image/service/getty-tty3/run2
-rwxr-xr-xhost/rootfs/etc/s6-linux-init/run-image/service/getty-tty4/run2
-rwxr-xr-xhost/rootfs/etc/s6-linux-init/run-image/service/getty-ttyS0/run2
-rwxr-xr-xhost/rootfs/etc/s6-linux-init/scripts/rc.init2
-rw-r--r--host/rootfs/etc/s6-rc/card0/up2
-rw-r--r--host/rootfs/etc/s6-rc/core/up2
-rw-r--r--host/rootfs/etc/s6-rc/ext-rc-init/up2
-rw-r--r--host/rootfs/etc/s6-rc/ext/up2
-rw-r--r--host/rootfs/etc/s6-rc/mdevd-coldplug/up2
-rw-r--r--host/rootfs/etc/s6-rc/mdevd/run2
-rw-r--r--host/rootfs/etc/s6-rc/static-nodes/up2
-rw-r--r--host/rootfs/etc/s6-rc/weston/run2
-rwxr-xr-xhost/rootfs/etc/xdg/weston/autolaunch2
-rwxr-xr-xhost/rootfs/scripts/modprobe/gen_modalias.sh.awk2
-rwxr-xr-xhost/rootfs/scripts/modprobe/gen_modules.map.awk2
-rwxr-xr-xhost/rootfs/usr/bin/lsvm2
-rwxr-xr-xhost/rootfs/usr/bin/vm-console2
-rwxr-xr-xhost/rootfs/usr/bin/vm-start2
-rwxr-xr-xhost/rootfs/usr/bin/vm-stop2
30 files changed, 30 insertions, 30 deletions
diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile
index 005702a..41cf87c 100644
--- a/host/rootfs/Makefile
+++ b/host/rootfs/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/host/rootfs/etc/init b/host/rootfs/etc/init
index 9ccb18f..429830f 100755
--- a/host/rootfs/etc/init
+++ b/host/rootfs/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 -s /run/param -- $@
diff --git a/host/rootfs/etc/login b/host/rootfs/etc/login
index 4d482f5..34ff321 100755
--- a/host/rootfs/etc/login
+++ b/host/rootfs/etc/login
@@ -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>
 
 backtick USER { id -un }
diff --git a/host/rootfs/etc/mdev.conf b/host/rootfs/etc/mdev.conf
index 82630ec..1ea856e 100644
--- a/host/rootfs/etc/mdev.conf
+++ b/host/rootfs/etc/mdev.conf
@@ -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>
 
 -$MODALIAS=.* 0:0 660 +/etc/mdev/modalias.sh
diff --git a/host/rootfs/etc/mdev/block/add b/host/rootfs/etc/mdev/block/add
index 84aac73..75e0c31 100755
--- a/host/rootfs/etc/mdev/block/add
+++ b/host/rootfs/etc/mdev/block/add
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is>
 
 cd /dev
diff --git a/host/rootfs/etc/mdev/listen b/host/rootfs/etc/mdev/listen
index 3364e0a..6bc6f2c 100755
--- a/host/rootfs/etc/mdev/listen
+++ b/host/rootfs/etc/mdev/listen
@@ -1,5 +1,5 @@
 #!/bin/execlineb -s1
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
 
 foreground {
diff --git a/host/rootfs/etc/mdev/net/add b/host/rootfs/etc/mdev/net/add
index 7b282e7..cc0bd20 100755
--- a/host/rootfs/etc/mdev/net/add
+++ b/host/rootfs/etc/mdev/net/add
@@ -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>
 
 # Assign the whole IOMMU group containing this device to the network
diff --git a/host/rootfs/etc/mdev/wait b/host/rootfs/etc/mdev/wait
index b7de5f8..3b85de8 100755
--- a/host/rootfs/etc/mdev/wait
+++ b/host/rootfs/etc/mdev/wait
@@ -1,5 +1,5 @@
 #!/bin/execlineb -s1
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
 
 foreground {
diff --git a/host/rootfs/etc/parse-devname b/host/rootfs/etc/parse-devname
index ce97491..cb43fbc 100755
--- a/host/rootfs/etc/parse-devname
+++ b/host/rootfs/etc/parse-devname
@@ -1,5 +1,5 @@
 #!/bin/awk -f
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
 
 # Parses modules.devname into space-separated arguments suitable for mknod(1).
diff --git a/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty1/run b/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty1/run
index c6da707..1ce0766 100755
--- a/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty1/run
+++ b/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty1/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>
 
 getty -i -n -l /etc/login 0 tty1 linux
diff --git a/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty2/run b/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty2/run
index 5af93e3..e619191 100755
--- a/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty2/run
+++ b/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty2/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>
 
 getty -i -n -l /etc/login 0 tty2 linux
diff --git a/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty3/run b/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty3/run
index fc4ec34..e3e0634 100755
--- a/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty3/run
+++ b/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty3/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>
 
 getty -i -n -l /etc/login 0 tty3 linux
diff --git a/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty4/run b/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty4/run
index e32196b..9e1d46d 100755
--- a/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty4/run
+++ b/host/rootfs/etc/s6-linux-init/run-image/service/getty-tty4/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>
 
 getty -i -n -l /etc/login 0 tty4 linux
diff --git a/host/rootfs/etc/s6-linux-init/run-image/service/getty-ttyS0/run b/host/rootfs/etc/s6-linux-init/run-image/service/getty-ttyS0/run
index d93e03f..9e30166 100755
--- a/host/rootfs/etc/s6-linux-init/run-image/service/getty-ttyS0/run
+++ b/host/rootfs/etc/s6-linux-init/run-image/service/getty-ttyS0/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>
 
 getty -i -n -l /etc/login 0,115200,57600,38400,9600 ttyS0 dumb
diff --git a/host/rootfs/etc/s6-linux-init/scripts/rc.init b/host/rootfs/etc/s6-linux-init/scripts/rc.init
index e205d8f..1016d0c 100755
--- a/host/rootfs/etc/s6-linux-init/scripts/rc.init
+++ b/host/rootfs/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/host/rootfs/etc/s6-rc/card0/up b/host/rootfs/etc/s6-rc/card0/up
index 70907f4..703562e 100644
--- a/host/rootfs/etc/s6-rc/card0/up
+++ b/host/rootfs/etc/s6-rc/card0/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>
 
 /etc/mdev/wait card0
diff --git a/host/rootfs/etc/s6-rc/core/up b/host/rootfs/etc/s6-rc/core/up
index 0c99987..0199ae7 100644
--- a/host/rootfs/etc/s6-rc/core/up
+++ b/host/rootfs/etc/s6-rc/core/up
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is>
 
 redirfd -w 1 /proc/sys/kernel/core_pattern
diff --git a/host/rootfs/etc/s6-rc/ext-rc-init/up b/host/rootfs/etc/s6-rc/ext-rc-init/up
index 8fcbd1d..1aec7fb 100644
--- a/host/rootfs/etc/s6-rc/ext-rc-init/up
+++ b/host/rootfs/etc/s6-rc/ext-rc-init/up
@@ -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>
 
 if { mkdir -p /run/s6-rc.ext.src }
diff --git a/host/rootfs/etc/s6-rc/ext/up b/host/rootfs/etc/s6-rc/ext/up
index 63bbe81..d9e0426 100644
--- a/host/rootfs/etc/s6-rc/ext/up
+++ b/host/rootfs/etc/s6-rc/ext/up
@@ -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>
 
 /etc/mdev/wait ext
diff --git a/host/rootfs/etc/s6-rc/mdevd-coldplug/up b/host/rootfs/etc/s6-rc/mdevd-coldplug/up
index a5d4dc1..8698f7d 100644
--- a/host/rootfs/etc/s6-rc/mdevd-coldplug/up
+++ b/host/rootfs/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/host/rootfs/etc/s6-rc/mdevd/run b/host/rootfs/etc/s6-rc/mdevd/run
index c4615c8..55899bb 100644
--- a/host/rootfs/etc/s6-rc/mdevd/run
+++ b/host/rootfs/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-2022 Alyssa Ross <hi@alyssa.is>
 
 mdevd -D3 -O4 -b134217728
diff --git a/host/rootfs/etc/s6-rc/static-nodes/up b/host/rootfs/etc/s6-rc/static-nodes/up
index 3020681..e98efc1 100644
--- a/host/rootfs/etc/s6-rc/static-nodes/up
+++ b/host/rootfs/etc/s6-rc/static-nodes/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>
 
 pipeline {
diff --git a/host/rootfs/etc/s6-rc/weston/run b/host/rootfs/etc/s6-rc/weston/run
index df765cb..a150044 100644
--- a/host/rootfs/etc/s6-rc/weston/run
+++ b/host/rootfs/etc/s6-rc/weston/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>
 
 foreground {
diff --git a/host/rootfs/etc/xdg/weston/autolaunch b/host/rootfs/etc/xdg/weston/autolaunch
index 4506e0c..7a85ae1 100755
--- a/host/rootfs/etc/xdg/weston/autolaunch
+++ b/host/rootfs/etc/xdg/weston/autolaunch
@@ -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>
 
 # Notify readiness
diff --git a/host/rootfs/scripts/modprobe/gen_modalias.sh.awk b/host/rootfs/scripts/modprobe/gen_modalias.sh.awk
index 0546cd4..65852c1 100755
--- a/host/rootfs/scripts/modprobe/gen_modalias.sh.awk
+++ b/host/rootfs/scripts/modprobe/gen_modalias.sh.awk
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
 #
 # This program generates a shell script expected to be run with a
diff --git a/host/rootfs/scripts/modprobe/gen_modules.map.awk b/host/rootfs/scripts/modprobe/gen_modules.map.awk
index d4f8abf..f182479 100755
--- a/host/rootfs/scripts/modprobe/gen_modules.map.awk
+++ b/host/rootfs/scripts/modprobe/gen_modules.map.awk
@@ -1,5 +1,5 @@
 #!/usr/bin/awk -f
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
 
 function driver(type) {
diff --git a/host/rootfs/usr/bin/lsvm b/host/rootfs/usr/bin/lsvm
index 8198752..082ee3c 100755
--- a/host/rootfs/usr/bin/lsvm
+++ b/host/rootfs/usr/bin/lsvm
@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is>
 
 foreground { s6-rc -bu change ext }
diff --git a/host/rootfs/usr/bin/vm-console b/host/rootfs/usr/bin/vm-console
index 5b688af..4db59b4 100755
--- a/host/rootfs/usr/bin/vm-console
+++ b/host/rootfs/usr/bin/vm-console
@@ -1,5 +1,5 @@
 #!/bin/execlineb -S1
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is>
 
 backtick -E pty {
diff --git a/host/rootfs/usr/bin/vm-start b/host/rootfs/usr/bin/vm-start
index 763f301..87db927 100755
--- a/host/rootfs/usr/bin/vm-start
+++ b/host/rootfs/usr/bin/vm-start
@@ -1,5 +1,5 @@
 #!/bin/execlineb -S1
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is>
 
 foreground { s6-rc -bu change ext-rc }
diff --git a/host/rootfs/usr/bin/vm-stop b/host/rootfs/usr/bin/vm-stop
index a7ab970..bad8981 100755
--- a/host/rootfs/usr/bin/vm-stop
+++ b/host/rootfs/usr/bin/vm-stop
@@ -1,5 +1,5 @@
 #!/bin/execlineb -S1
-# SPDX-License-Identifier: EUPL-1.2
+# SPDX-License-Identifier: EUPL-1.2+
 # SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is>
 
 s6-rc -l /run/s6-rc.ext -d change $1