Using a dependencies file is deprecated. No functional change intended. Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com> --- Except for whitespace and comments, the files removed in this change can only be written in one way. Therefore, they have no creative expression in them, meaning they are not eligible for copyright protection. I thus didn't bother to port over the copyright notices. --- host/rootfs/Makefile | 6 +++--- host/rootfs/etc/s6-rc/mdevd-coldplug/dependencies | 4 ---- host/rootfs/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd | 0 host/rootfs/etc/s6-rc/sys-vmms/dependencies | 4 ---- host/rootfs/etc/s6-rc/sys-vmms/dependencies.d/vmm-env | 0 host/rootfs/etc/s6-rc/weston/dependencies | 4 ---- host/rootfs/etc/s6-rc/weston/dependencies.d/card0 | 0 img/app/Makefile | 2 +- img/app/etc/s6-rc/mdevd-coldplug/dependencies | 4 ---- img/app/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd | 0 vm/sys/net/Makefile | 4 ++-- vm/sys/net/etc/s6-rc/connman/dependencies | 4 ---- vm/sys/net/etc/s6-rc/connman/dependencies.d/dbus | 0 vm/sys/net/etc/s6-rc/mdevd-coldplug/dependencies | 4 ---- vm/sys/net/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd | 0 15 files changed, 6 insertions(+), 30 deletions(-) diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index e96458dba06ae31129b115b2b649962f8d88187a..367e824622053fa216cf81658d5c84eeb3db6470 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -136,7 +136,7 @@ S6_RC_FILES = \ etc/s6-rc/kvm/timeout-up \ etc/s6-rc/kvm/type \ etc/s6-rc/kvm/up \ - etc/s6-rc/mdevd-coldplug/dependencies \ + etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd \ etc/s6-rc/mdevd-coldplug/type \ etc/s6-rc/mdevd-coldplug/up \ etc/s6-rc/mdevd/notification-fd \ @@ -146,14 +146,14 @@ S6_RC_FILES = \ etc/s6-rc/ok-all/type \ etc/s6-rc/static-nodes/type \ etc/s6-rc/static-nodes/up \ - etc/s6-rc/sys-vmms/dependencies \ + etc/s6-rc/sys-vmms/dependencies.d/vmm-env \ etc/s6-rc/sys-vmms/type \ etc/s6-rc/sys-vmms/up \ etc/s6-rc/vm-env/contents \ etc/s6-rc/vm-env/type \ etc/s6-rc/vmm-env/contents \ etc/s6-rc/vmm-env/type \ - etc/s6-rc/weston/dependencies \ + etc/s6-rc/weston/dependencies.d/card0 \ etc/s6-rc/weston/notification-fd \ etc/s6-rc/weston/run \ etc/s6-rc/weston/type diff --git a/host/rootfs/etc/s6-rc/mdevd-coldplug/dependencies b/host/rootfs/etc/s6-rc/mdevd-coldplug/dependencies deleted file mode 100644 index 59b02b7356ea0d88ac446cea74791a9cd3303de4..0000000000000000000000000000000000000000 --- a/host/rootfs/etc/s6-rc/mdevd-coldplug/dependencies +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> -# -mdevd diff --git a/host/rootfs/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd b/host/rootfs/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/host/rootfs/etc/s6-rc/sys-vmms/dependencies b/host/rootfs/etc/s6-rc/sys-vmms/dependencies deleted file mode 100644 index cdc42d5beaa12ff5dfbccf07dacf33a0e5bef9ce..0000000000000000000000000000000000000000 --- a/host/rootfs/etc/s6-rc/sys-vmms/dependencies +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2024 Alyssa Ross <hi@alyssa.is> -# -vmm-env diff --git a/host/rootfs/etc/s6-rc/sys-vmms/dependencies.d/vmm-env b/host/rootfs/etc/s6-rc/sys-vmms/dependencies.d/vmm-env new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/host/rootfs/etc/s6-rc/weston/dependencies b/host/rootfs/etc/s6-rc/weston/dependencies deleted file mode 100644 index 8470c0fabc5c85b2529ee26ad82d3910e95f23cb..0000000000000000000000000000000000000000 --- a/host/rootfs/etc/s6-rc/weston/dependencies +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> -# -card0 diff --git a/host/rootfs/etc/s6-rc/weston/dependencies.d/card0 b/host/rootfs/etc/s6-rc/weston/dependencies.d/card0 new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/img/app/Makefile b/img/app/Makefile index 9665a6b7158f2d8b183831202a4559ae06d53d16..595540c35982b9bbb9b681042338849a9d6318f6 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -94,7 +94,7 @@ VM_S6_RC_FILES = \ etc/s6-rc/dbus/notification-fd \ etc/s6-rc/dbus/run \ etc/s6-rc/dbus/type \ - etc/s6-rc/mdevd-coldplug/dependencies \ + etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd \ etc/s6-rc/mdevd-coldplug/type \ etc/s6-rc/mdevd-coldplug/up \ etc/s6-rc/mdevd/notification-fd \ diff --git a/img/app/etc/s6-rc/mdevd-coldplug/dependencies b/img/app/etc/s6-rc/mdevd-coldplug/dependencies deleted file mode 100644 index 59b02b7356ea0d88ac446cea74791a9cd3303de4..0000000000000000000000000000000000000000 --- a/img/app/etc/s6-rc/mdevd-coldplug/dependencies +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> -# -mdevd diff --git a/img/app/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd b/img/app/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 755b145175199aa97049dbd7feadc0e76230cf30..8ff0db74e9426e75d7ef76a9f0b0b8bfe491bd9b 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -59,13 +59,13 @@ build/rootfs.erofs: ../../../scripts/make-erofs.sh $(PACKAGES_FILE) $(VM_FILES) ) | ../../../scripts/make-erofs.sh $@ VM_S6_RC_FILES = \ - etc/s6-rc/connman/dependencies \ + etc/s6-rc/connman/dependencies.d/dbus \ etc/s6-rc/connman/run \ etc/s6-rc/connman/type \ etc/s6-rc/dbus/notification-fd \ etc/s6-rc/dbus/run \ etc/s6-rc/dbus/type \ - etc/s6-rc/mdevd-coldplug/dependencies \ + etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd \ etc/s6-rc/mdevd-coldplug/type \ etc/s6-rc/mdevd-coldplug/up \ etc/s6-rc/mdevd/notification-fd \ diff --git a/vm/sys/net/etc/s6-rc/connman/dependencies b/vm/sys/net/etc/s6-rc/connman/dependencies deleted file mode 100644 index 23bda199ae908f6738f11546e088dfaa6748da6a..0000000000000000000000000000000000000000 --- a/vm/sys/net/etc/s6-rc/connman/dependencies +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> -# -dbus diff --git a/vm/sys/net/etc/s6-rc/connman/dependencies.d/dbus b/vm/sys/net/etc/s6-rc/connman/dependencies.d/dbus new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/vm/sys/net/etc/s6-rc/mdevd-coldplug/dependencies b/vm/sys/net/etc/s6-rc/mdevd-coldplug/dependencies deleted file mode 100644 index 59b02b7356ea0d88ac446cea74791a9cd3303de4..0000000000000000000000000000000000000000 --- a/vm/sys/net/etc/s6-rc/mdevd-coldplug/dependencies +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 -# SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is> -# -mdevd diff --git a/vm/sys/net/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd b/vm/sys/net/etc/s6-rc/mdevd-coldplug/dependencies.d/mdevd new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 --- base-commit: 636a47c9243a8cf0387b6e2e4fbb7d8972e501f4 change-id: 20250913-no-deprecated-s6-rc-aa91c5891277 -- Sincerely, Demi Marie Obenour (she/her/hers)