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 32C7EE95; Sat, 13 Sep 2025 18:03:43 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 8520AE8C; Sat, 13 Sep 2025 18:03:40 +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-yb1-xb2c.google.com (mail-yb1-xb2c.google.com [IPv6:2607:f8b0:4864:20::b2c]) by atuin.qyliss.net (Postfix) with ESMTPS id E746CE8B for ; Sat, 13 Sep 2025 18:03:38 +0000 (UTC) Received: by mail-yb1-xb2c.google.com with SMTP id 3f1490d57ef6-ea4036dbdb4so20529276.0 for ; Sat, 13 Sep 2025 11:03:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1757786617; x=1758391417; 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=HS2ewL96YD9IdtcOgXXNKwdZet+pC11+3gJU0lUNjGk=; b=U3K5kt9bwyNojQhkERnaMcxE/bzFFmSxN+mw5LC5ugC6xgynW9E8t4v60Gv8lL+yg8 /ZSQZtVuiAmFcp5AjVvo0MoUJmJR+pwD5U4rQOZum0J0KHxSc17qhH3PmoZ4tcD4Zm9a epeIMDVtIDYX/Gp9ybqrPPJP5qHeS3s/23IgeVvna+GMSQWFIn/sHdtIEJOvyMg6mAhM cQ1x6ip5HUHSLRazj6J18UyAfwqd4Js9wPlUpACgZ6RS6z/+Jg+xrPaYAcSRstfFskUD Q5FbFEJo3ZSM+pJqfW1e2r0W7IKQxrc+m/puk3gGMbV8ajaIiC1S6QG09vXyAfQ/2wOK 93mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757786617; x=1758391417; 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=HS2ewL96YD9IdtcOgXXNKwdZet+pC11+3gJU0lUNjGk=; b=ooSTn6OUbAIIrpLP2/zqpUke3uuzYCSbpygq7iiS+UCkK7ckdHV84xe0/zZx9coAdn cPoO5UxmIJ4gM2KaSLHiFZQJSpbEK+lFXb18DSn9ZNEgDYGsS31JCB865n/wBYfEHRRA mrPvg40IAbKX6+eaNyzONgNhw34obrDW6pGxTkAcPofcNymHGylN0zEJnpduWNQUcddy N2n7U3k+3p0v6keZZ22Su+YpdlzOZq2EoT3z2XMtzVxBRZp6kx0OlPC7T2OwnO3in65P p9zk6zECGAexbTn9YgBJ5zTvLJrq1Fr6nZvOGu6wfxlE7RrJUNam4jTkIyTtAYxjdVrY ruyA== X-Gm-Message-State: AOJu0Yyv8nI/aVu8Wk2/dvM2N3swHLoI0tYInXlGTjYOYLoPWPh+l6uf E1LLhUYVIBpltXE9a+FBcd4HqU8bdUlhp4+2VDNAFG1EFsqrXeICdv8JPyoL4w== X-Gm-Gg: ASbGnctscXja2F6W/RqIEPjmM7L7lI24kbjdnluN9FHOL6xKSePnlxhnVaNizaA7yjD RwHtX3LkiCwllD5WE6VJZ4qW9txjZCFlzTLpniJ4KetXqCXvPIdDHQIgmrrG3ePzaPmlNtvvh2R l0nhdZXMrk882ZfGIyDcpHyICR36vQtEjXpbbxCCgjvitYwLDyfTWe3X+TukVcsqCbNndhrj7DX UiK/1OnicL7ul9Qpbtt7WgQ9aVhucUa9ayOhbHGc45QXEG+GweuMA7k7rQlnvyLZpvlxmHz5Gat OXQxTFYIY+F1wPQutroLlwbgN3Lyp0InGaZq/FwL4BDrmnU3Yybj5vEKSJZo7Ku3ajSRDIXdr1b IRwdii2+BBvwninvLosifV5v9faLRcfLzB6zv2QB9oyAvuuN54wPYiXPa1xHWH/jaWFRHSGtxLd c/Byimr/HLU9Of3Tn92wlv89h679jpwHyfINBUwrKKSgo= X-Google-Smtp-Source: AGHT+IHo/cR8gONmGAR8CKgFo5tTM903BKlHozTAz01fyUbKkBeYkjUc59WGLZBi3TAezOGTHTQuew== X-Received: by 2002:a05:690e:430e:b0:62e:a75a:3944 with SMTP id 956f58d0204a3-62ea75a3c76mr287186d50.1.1757786617297; Sat, 13 Sep 2025 11:03:37 -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-ea3cf23025bsm2405720276.23.2025.09.13.11.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Sep 2025 11:03:36 -0700 (PDT) From: Demi Marie Obenour Date: Sat, 13 Sep 2025 14:02:50 -0400 Subject: [PATCH] Use dependencies.d to declare s6-rc dependencies MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250913-no-deprecated-s6-rc-v1-1-dd89de0efc9d@gmail.com> X-B4-Tracking: v=1; b=H4sIAMmxxWgC/x2MQQqAIBAAvyJ7bkENK/tKdBDdai8aGhGEf086D sPMC4UyU4FZvJDp5sIpNlCdAH+4uBNyaAxaaiOt6jEmDHRm8u6igGXA7NE5q7yZrNLjCK1seuP nvy5rrR8KJT+TZQAAAA== X-Change-ID: 20250913-no-deprecated-s6-rc-aa91c5891277 To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1757786569; l=7946; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=J04efBF5nBgMxeWvlDl9O/bZTmAKt9Fjy6VnnEOCl64=; b=nbMiibhmXxS+f8JLgND66izjRB+GP5QYmmRu30+FdQjXlMagalE2irEppIhWmZKWEL0eeQS7M Lwv71YXic1oA6eVFjNU812rQYvc/H/wX3TS3OUq/6YYDrxuenIWlQW5 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: HBMXSNHY5PRUKSQKW5B6NRTG2YDBVIXQ X-Message-ID-Hash: HBMXSNHY5PRUKSQKW5B6NRTG2YDBVIXQ 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: Using a dependencies file is deprecated. No functional change intended. Signed-off-by: Demi Marie Obenour --- 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 -# -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 -# -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 -# -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 -# -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 -# -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 -# -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)