From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 297F61F9CC; Fri, 26 Sep 2025 15:40:49 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 11D8F1F9C2; Fri, 26 Sep 2025 15:40:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yx1-xb12d.google.com (mail-yx1-xb12d.google.com [IPv6:2607:f8b0:4864:20::b12d]) by atuin.qyliss.net (Postfix) with ESMTPS id 1CFF91F9C1 for ; Fri, 26 Sep 2025 15:40:47 +0000 (UTC) Received: by mail-yx1-xb12d.google.com with SMTP id 956f58d0204a3-636d5cefab2so1519920d50.2 for ; Fri, 26 Sep 2025 08:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758901246; x=1759506046; darn=spectrum-os.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=DKW+z/4Y4w3kKt5TOrwtwoQW508rpIHWJ5jcOfwsPB0=; b=OzCmBpBM+lb/uAmYx41+NH58/ya5ewOLDBhsKgHRxpN/tMQQnInwnkoECdCRxSFZqc GrNk8lVIQJrn9xWB3mafndTkwV6yRHgZ9AhXW5lk6Gi4SzWoUnpn3AYvJ8ERceOG0vY+ W9TxpFfW5v6AZ8EUrlcrs3TcASYIC5cG4XObfjUUGbyk52SAh1LEKsTxUKonqNoBzktX oYaV1OC82+Qt8lGgWM2bYgLajN0VPVtFxBRZagX+137R2jWJQ1mcVi0lHlcMFKGZ4ybj gKMkco/yOMU1H7DURsIF11Ribt3tUSjYlf/QuXf8+pO2dZy72XI73C+Npb0fgL6k65cP QOhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758901246; x=1759506046; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DKW+z/4Y4w3kKt5TOrwtwoQW508rpIHWJ5jcOfwsPB0=; b=i+P/wn73sAjuSv+zGhhYGneOkFu5LvbdEEHDunm6c/H+UwIpXCubJt0s7qqC7qVs/t qmuqTHJPrX5VlmdaLkUOjztKvL4tUmNGIDYaFlqPgEzbdjN43BS8l3GXBcod1OJ+LCPd +icLMFePqO9NeJmfli1UPRykNj6uJtL6+KUbbwQvn/c81UqfexXYiCSOanCv5PrzAd3M vaskNlXlhpwFTI49M7RHVPTpmG15p8KSM3SNtunOsMnFdz6qFau24svoA/PmvPCD9/EN LPxeMWOIHDt2tXCOcMpgcEYWmmsgAOSL9c31yucO+Hf+jzOVgB+bif8XP6oRZEG6Sfcw S+xA== X-Gm-Message-State: AOJu0Yx2BRLrXSI/zD3SH1W9sQdK24QO6tXW7VCQ3RHb0a6jPf1dfltp C9RD6t9e+rD3lgoC4xRMXVdjeb7xbbXoOR7dTGEG55eZg4XRFCHCVFIMxhbr2PFZ X-Gm-Gg: ASbGncsOft8L2HUlSBEQR+NUdrA9zYwmv00VcTGXTDqp69IR22hWViaB1j3QIjaHfp2 pmr+9+iczhYMR1M6Rhdz+nwwLS+/U6H/zKWn+LiEpbX3YVmaXUL8GIVSbxCC/h58XSpiATy6wqm RRmT4m6KIo4dLFtmZJgztrP0DDxfL43UVI1dLGtpjgACkm7eudZhrEf/BBwSj5xoMHEe4qAggfY 4INVj7Ke4URK8x5McHHnEThx1PzLKDRxiP3yeIgKPwt5Wim1aSrEeXlpGpB143CN2ullPlqanKi 40Gwqah6+ch1nKFRqZGr4wGt5Sc/JXo+JamkPhryjW/08/69EHKN5LY3rx+ZHcAPC5lecbrWttA 9qJFBBtnti899sNz/3muYqfoox4fl1I4fBO7rwVt0oqUT+9zKQuFMIs81E+WiEHRoQCJmFSp2VZ duqJhz+iCbq9m15nGhqsN8rwCUv/KZ3hIT60fiMtLUbeYenFxm1uTR+A== X-Google-Smtp-Source: AGHT+IGz/fZgOAwmtQZRFzzxYcamQlhviTxhQ3S8OH3HiDrvSLpwj1U3NBMxaElITeGOETLoEKrx0w== X-Received: by 2002:a53:d00d:0:b0:62b:7d25:1914 with SMTP id 956f58d0204a3-6361a6eb9c7mr5385120d50.3.1758901245470; Fri, 26 Sep 2025 08:40:45 -0700 (PDT) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 3f1490d57ef6-eb38393d51csm1428622276.27.2025.09.26.08.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Sep 2025 08:40:44 -0700 (PDT) From: Demi Marie Obenour Date: Fri, 26 Sep 2025 11:40:01 -0400 Subject: [PATCH] Use contents.d for bundles MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250926-contents-d-v1-1-b67c8a520ba6@gmail.com> X-B4-Tracking: v=1; b=H4sIANGz1mgC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI1MDSyMz3eT8vJLUvJJi3RRdI8NUI0NzA8O0FGNTJaCGgqLUtMwKsGHRsbW 1AOgqHA5cAAAA X-Change-ID: 20250926-contents-d-21e21701fd35 To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1758901201; l=9773; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=AupNMFuGTin6bVK1x/28LNC1+Cqz1+lGTqhEuN23nHg=; b=I58DX0WBQf2PJQ/SKQrsXAk083IBFL2ZOHdsZEDZrGP8KaVEZWpPEMWt/zTBrRgr9lnnnZfCU GpdyNLA1pqhA4yu8azWlT6pWUsNHodt60JG9BOyE7X7gOl5atTKXtZ2 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: 4TN773UQVN3TWHM3UTAS6MSIIM7T34GG X-Message-ID-Hash: 4TN773UQVN3TWHM3UTAS6MSIIM7T34GG X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Alyssa Ross , Demi Marie Obenour X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: contents files are deprecated. Signed-off-by: Demi Marie Obenour --- 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 -# -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 -# -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 -# -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 -# -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 -# -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)