[PATCH] Use contents.d for bundles

Demi Marie Obenour
2025-09-26T15:40:49Z

contents files are deprecated.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
---
host/rootfs/Makefile | 12 ++++++++----
host/rootfs/image/etc/s6-rc/ok-all/contents | 6 ------
host/rootfs/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug | 0
host/rootfs/image/etc/s6-rc/ok-all/contents.d/sys-vmms | 0
host/rootfs/image/etc/s6-rc/ok-all/contents.d/vm-env | 0
host/rootfs/image/etc/s6-rc/vm-env/contents | 5 -----
host/rootfs/image/etc/s6-rc/vm-env/contents.d/static-nodes | 0
host/rootfs/image/etc/s6-rc/vm-env/contents.d/weston | 0
host/rootfs/image/etc/s6-rc/vmm-env/contents | 6 ------
host/rootfs/image/etc/s6-rc/vmm-env/contents.d/core | 0
host/rootfs/image/etc/s6-rc/vmm-env/contents.d/kvm | 0
host/rootfs/image/etc/s6-rc/vmm-env/contents.d/static-nodes | 0
img/app/Makefile | 4 +++-
img/app/image/etc/s6-rc/ok-all/contents | 6 ------
img/app/image/etc/s6-rc/ok-all/contents.d/app | 0
img/app/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug | 0
img/app/image/etc/s6-rc/ok-all/contents.d/wireplumber | 0
vm/sys/net/Makefile | 3 ++-
vm/sys/net/image/etc/s6-rc/ok-all/contents | 5 -----
vm/sys/net/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug | 0
vm/sys/net/image/etc/s6-rc/ok-all/contents.d/sysctl | 0
21 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile
index 1c6220031ed727c3a3686a43ead37aada6e15b4f..7652515ca27c8feb87e77d0fd79750eda9675c97 100644
--- a/host/rootfs/Makefile
+++ b/host/rootfs/Makefile
@@ -142,22 +142,26 @@ S6_RC_FILES = \
image/etc/s6-rc/mdevd/notification-fd \
image/etc/s6-rc/mdevd/run \
image/etc/s6-rc/mdevd/type \
- image/etc/s6-rc/ok-all/contents \
+ image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug \
+ image/etc/s6-rc/ok-all/contents.d/sys-vmms \
+ image/etc/s6-rc/ok-all/contents.d/vm-env \
image/etc/s6-rc/ok-all/type \
image/etc/s6-rc/static-nodes/type \
image/etc/s6-rc/static-nodes/up \
image/etc/s6-rc/sys-vmms/dependencies.d/vmm-env \
image/etc/s6-rc/sys-vmms/type \
image/etc/s6-rc/sys-vmms/up \
- image/etc/s6-rc/vm-env/contents \
+ image/etc/s6-rc/vm-env/contents.d/static-nodes \
+ image/etc/s6-rc/vm-env/contents.d/weston \
image/etc/s6-rc/vm-env/type \
- image/etc/s6-rc/vmm-env/contents \
+ image/etc/s6-rc/vmm-env/contents.d/core \
+ image/etc/s6-rc/vmm-env/contents.d/kvm \
+ image/etc/s6-rc/vmm-env/contents.d/static-nodes \
image/etc/s6-rc/vmm-env/type \
image/etc/s6-rc/weston/dependencies.d/card0 \
image/etc/s6-rc/weston/notification-fd \
image/etc/s6-rc/weston/run \
image/etc/s6-rc/weston/type
-
# s6-rc-compile's input is a directory, but that doesn't play nice
# with Make, because it won't know to update if some file in the
# directory is changed, or a file is created or removed in a
diff --git a/host/rootfs/image/etc/s6-rc/ok-all/contents b/host/rootfs/image/etc/s6-rc/ok-all/contents
deleted file mode 100644
index 9f8b0ed66ceedd591ed2f1a7e164d9abcc54cc53..0000000000000000000000000000000000000000
--- a/host/rootfs/image/etc/s6-rc/ok-all/contents
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
-#
-mdevd-coldplug
-sys-vmms
-vm-env
diff --git a/host/rootfs/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug b/host/rootfs/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/host/rootfs/image/etc/s6-rc/ok-all/contents.d/sys-vmms b/host/rootfs/image/etc/s6-rc/ok-all/contents.d/sys-vmms
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/host/rootfs/image/etc/s6-rc/ok-all/contents.d/vm-env b/host/rootfs/image/etc/s6-rc/ok-all/contents.d/vm-env
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/host/rootfs/image/etc/s6-rc/vm-env/contents b/host/rootfs/image/etc/s6-rc/vm-env/contents
deleted file mode 100644
index 580795b1b02bb7a8dff7f872723c678141d4bb70..0000000000000000000000000000000000000000
--- a/host/rootfs/image/etc/s6-rc/vm-env/contents
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
-#
-static-nodes
-weston
diff --git a/host/rootfs/image/etc/s6-rc/vm-env/contents.d/static-nodes b/host/rootfs/image/etc/s6-rc/vm-env/contents.d/static-nodes
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/host/rootfs/image/etc/s6-rc/vm-env/contents.d/weston b/host/rootfs/image/etc/s6-rc/vm-env/contents.d/weston
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/host/rootfs/image/etc/s6-rc/vmm-env/contents b/host/rootfs/image/etc/s6-rc/vmm-env/contents
deleted file mode 100644
index ee1e3cfc39d1a6545bbefc3692782b9de6b3ade3..0000000000000000000000000000000000000000
--- a/host/rootfs/image/etc/s6-rc/vmm-env/contents
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
-#
-core
-kvm
-static-nodes
diff --git a/host/rootfs/image/etc/s6-rc/vmm-env/contents.d/core b/host/rootfs/image/etc/s6-rc/vmm-env/contents.d/core
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/host/rootfs/image/etc/s6-rc/vmm-env/contents.d/kvm b/host/rootfs/image/etc/s6-rc/vmm-env/contents.d/kvm
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/host/rootfs/image/etc/s6-rc/vmm-env/contents.d/static-nodes b/host/rootfs/image/etc/s6-rc/vmm-env/contents.d/static-nodes
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/img/app/Makefile b/img/app/Makefile
index 8b9ecf990fe10adb7aa19b46935826d684f10686..db9b53e434b2d018d76d92f7672bdd0718180fbd 100644
--- a/img/app/Makefile
+++ b/img/app/Makefile
@@ -100,7 +100,9 @@ VM_S6_RC_FILES = \
image/etc/s6-rc/mdevd/notification-fd \
image/etc/s6-rc/mdevd/run \
image/etc/s6-rc/mdevd/type \
- image/etc/s6-rc/ok-all/contents \
+ image/etc/s6-rc/ok-all/contents.d/app \
+ image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug \
+ image/etc/s6-rc/ok-all/contents.d/wireplumber \
image/etc/s6-rc/ok-all/type \
image/etc/s6-rc/pipewire/notification-fd \
image/etc/s6-rc/pipewire/run \
diff --git a/img/app/image/etc/s6-rc/ok-all/contents b/img/app/image/etc/s6-rc/ok-all/contents
deleted file mode 100644
index 6788e54384f065890d00d77378ea5c45ec89f61c..0000000000000000000000000000000000000000
--- a/img/app/image/etc/s6-rc/ok-all/contents
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
-#
-mdevd-coldplug
-wireplumber
-app
diff --git a/img/app/image/etc/s6-rc/ok-all/contents.d/app b/img/app/image/etc/s6-rc/ok-all/contents.d/app
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/img/app/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug b/img/app/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/img/app/image/etc/s6-rc/ok-all/contents.d/wireplumber b/img/app/image/etc/s6-rc/ok-all/contents.d/wireplumber
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile
index 0277b16f5acfac6c9eaed5f128333d1545e7c9ab..38a9af765683f287d621d5a2107a78c84b9b166e 100644
--- a/vm/sys/net/Makefile
+++ b/vm/sys/net/Makefile
@@ -73,7 +73,8 @@ VM_S6_RC_FILES = \
image/etc/s6-rc/mdevd/type \
image/etc/s6-rc/nftables/type \
image/etc/s6-rc/nftables/up \
- image/etc/s6-rc/ok-all/contents \
+ image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug \
+ image/etc/s6-rc/ok-all/contents.d/sysctl \
image/etc/s6-rc/ok-all/type \
image/etc/s6-rc/sysctl/type \
image/etc/s6-rc/sysctl/up
diff --git a/vm/sys/net/image/etc/s6-rc/ok-all/contents b/vm/sys/net/image/etc/s6-rc/ok-all/contents
deleted file mode 100644
index 221d1429a8293738125f150dfaf5370672814b52..0000000000000000000000000000000000000000
--- a/vm/sys/net/image/etc/s6-rc/ok-all/contents
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is>
-#
-mdevd-coldplug
-sysctl
diff --git a/vm/sys/net/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug b/vm/sys/net/image/etc/s6-rc/ok-all/contents.d/mdevd-coldplug
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/vm/sys/net/image/etc/s6-rc/ok-all/contents.d/sysctl b/vm/sys/net/image/etc/s6-rc/ok-all/contents.d/sysctl
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391

---
base-commit: 2a6f0ff71f78a19d3227efc460d519cf9c9dfd39
change-id: 20250926-contents-d-21e21701fd35
--
Sincerely,
Demi Marie Obenour (she/her/hers)