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 5C075269DE; Thu, 04 Sep 2025 02:09:28 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 96AB226A07; Thu, 04 Sep 2025 02:09:24 +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-yw1-x1131.google.com (mail-yw1-x1131.google.com [IPv6:2607:f8b0:4864:20::1131]) by atuin.qyliss.net (Postfix) with ESMTPS id 4E457269B1 for ; Thu, 04 Sep 2025 02:09:22 +0000 (UTC) Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-71d6051aeafso6276297b3.2 for ; Wed, 03 Sep 2025 19:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756951761; x=1757556561; darn=spectrum-os.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=QxfGfLeWwGHHr6K9T0X4X4uSZMsvKk9qfd2JWmgxve4=; b=RrlM2pc7YkzKDsTdbtcO0mUS/03bkFX7BgtiIoazPO9JU/G5VXews5l9y8lXQNmSJ5 h62f9Kvz+lBQJBL1LbYhM7WwcvS1mdR1MGe2lqlQVm+RDYOzI+3JHsv8lcnmYSIVkedU wH2yHIpm7Gz0D5KtoXa7k3qBOMZz1UaaSzTnNGssf7XO0ZyWkWtvpXR7/R5FKB6qYPJG feB3Is5sm1VqWWYBQWCfBJyVd/NEFEH/1vXY8Ovec0Id5eSSga/dOB+jzu10azdg+TQq iV0sKOi/1b2Dzh/yKEeEnKVhgL8B5acWaM37qXtDdFftuwmZxyQ2tL/++nu0cvjCyPuA D9Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756951761; x=1757556561; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QxfGfLeWwGHHr6K9T0X4X4uSZMsvKk9qfd2JWmgxve4=; b=vRRTTSAkzv0r1Ee/kTJ1xc8DKD3CHA/rw9UpEPQ3KuKjvb8v32sjeCaBxLhSgtpTE4 bAY47JhCQ18PS3m1cQwcODJJ2REc0VN8WVHKyW2BcfczfaCYibfQDr9tbisMW1P9Q4ox fwpgpYZEVhpiMroLzP4jm6S1A1aLq7Pm86sUfcfZ3i0lOiCuiNwiVFe3C8VuDuXGLOC9 lvF+3OcC1q9r68x49fLVO+ihIJh+HsBVxmxwOc/cVPLxUkh2aR2Jzk0OQLpn98nYiZ2x om4FiQzMK4tgix3QWtnACimnjCt4R9C9hZmHCGlHVaJmPqlTgrOg+iiSJbwzsC9F9JQe O57A== X-Gm-Message-State: AOJu0YzjPId9Hlyeex/S23tkitbmJ4lRPAT4C3x+FC9jzFQfGvMnoGuw 9EjcWdmHeo3fA0quwEHYIphjwPD5ostZ27es1V2O5mn6fVJLXnnhtOPHG8sJug== X-Gm-Gg: ASbGncvD3FyhuKwETBSmVFOiUO7dToX6O4xUYKs+Y0FktyXe/o+Za9Jz69var2jEiQa eaDlAd7SA5Q9MnSEiIcO3H9XnqepVXz8lsWpuZK+HG8ZECtthTEDtrsTMeIEpFXp1BoBM57yfts fFjBMFZgBDQAXV1BkiD6jYH+HYhCYPBb0jua0jI7/eTBMSsqCZ46oQ8xsoxt9mQjtSlL0wnF6t2 7lLP5QlmtkQROtXjfalNq49ycuHIOYH0fpO1hJ6bigG6Ahh7f7AG+UEFPnQXXZF5JmEpwrdyWw2 u0+crhgyxYUhCm1BzOOxxgqISRUN96oGxnMfaE8bCmSoC7aGZ9xDimvJ5diH1bQXLHVQzsZAAhC XABRadB4iQ0c7lLCRercDccRuGyDAZTW+Ec6lUhsyJRXTix6OCo+czjkmT0GUv+YTAbDWBUMZY5 boef0TiN6MdNxqGXPNJ2DxTSl7UJIHEq2SLKyu1QXBDPU= X-Google-Smtp-Source: AGHT+IECh9GiSW4JFX7gephLYWKQsvWKvHzsRNs2dFV8NsAmDMx70YweYKra+h2p+OLvEtDaflA+eQ== X-Received: by 2002:a05:690c:64c7:b0:71f:f049:340a with SMTP id 00721157ae682-72276332d6emr202013927b3.1.1756951760943; Wed, 03 Sep 2025 19:09:20 -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 956f58d0204a3-608110cabd6sm508915d50.8.2025.09.03.19.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 19:09:20 -0700 (PDT) From: Demi Marie Obenour Date: Wed, 03 Sep 2025 21:56:55 -0400 Subject: [PATCH 4/4] Use /etc/s6-rc/compiled for compiled s6-rc directory MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250903-genfiles-v1-4-cc993fcb1e4c@gmail.com> References: <20250903-genfiles-v1-0-cc993fcb1e4c@gmail.com> In-Reply-To: <20250903-genfiles-v1-0-cc993fcb1e4c@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1756951011; l=3430; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=DlTLKLibB6lEqXJBSqbuVwbPiADN6B+/3xPUYuRy7cQ=; b=PYNlS9HjtNh9c4WbdgH1Ka1H9GKhCN+mibfW08Fbm7EDmjvtQFUSb/iUFUJFAc0WsZXwxcviQ k1xU7J+5UyyC70IRoFeRROjHuSzSDLg3mHobWx+3tUyAki9iN6NFfAP X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: 6I5TDUDMS4BZWTDMDHWC2IYQ3PK6I2RC X-Message-ID-Hash: 6I5TDUDMS4BZWTDMDHWC2IYQ3PK6I2RC 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: Demi Marie Obenour , Alyssa Ross 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: This is the default, so it makes things simpler and avoids having to specify "-c /etc/s6-rc" in every s6-rc-init invocation. This is not logically part of this patch series, but it shows how centralizing the make code makes changes easier. Signed-off-by: Demi Marie Obenour --- host/rootfs/image/etc/s6-linux-init/scripts/rc.init | 2 +- img/app/image/etc/s6-linux-init/scripts/rc.init | 2 +- lib/erofs.mk | 6 +++--- vm/sys/net/image/etc/s6-linux-init/scripts/rc.init | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/host/rootfs/image/etc/s6-linux-init/scripts/rc.init b/host/rootfs/image/etc/s6-linux-init/scripts/rc.init index 674fd38cc76837c7be25a5ef060f0f4d4b786394..b06a4ab7518f0af204475c41ee77ea5f8d657718 100755 --- a/host/rootfs/image/etc/s6-linux-init/scripts/rc.init +++ b/host/rootfs/image/etc/s6-linux-init/scripts/rc.init @@ -2,7 +2,7 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2022, 2024 Alyssa Ross -if { s6-rc-init -c /etc/s6-rc /run/service } +if { s6-rc-init /run/service } if { mount --make-shared /run } if { mount -a --mkdir } diff --git a/img/app/image/etc/s6-linux-init/scripts/rc.init b/img/app/image/etc/s6-linux-init/scripts/rc.init index 0bf350a7015b01072c1fe8dab6be2fb51fa71d5a..e4932e4ad478db7c51ab8c63ccb601d7a60efb85 100755 --- a/img/app/image/etc/s6-linux-init/scripts/rc.init +++ b/img/app/image/etc/s6-linux-init/scripts/rc.init @@ -8,7 +8,7 @@ if { ln -s /proc/self/fd/0 /dev/stdin } if { ln -s /proc/self/fd/1 /dev/stdout } if { ln -s /proc/self/fd/2 /dev/stderr } -if { s6-rc-init -c /etc/s6-rc /run/service } +if { s6-rc-init /run/service } if { modprobe overlay } if { mount -a --mkdir } diff --git a/lib/erofs.mk b/lib/erofs.mk index b3fc112f5e793725977cd8c4b2e71d6ed8d888c4..a65f2d004efed9dcf218dd806cf66071fb115db1 100644 --- a/lib/erofs.mk +++ b/lib/erofs.mk @@ -1,6 +1,6 @@ override basedir ::= $(dir $(lastword $(MAKEFILE_LIST)))/.. -override BUILD_FILES ::= $(BUILD_FILES) build/etc/s6-rc +override BUILD_FILES ::= $(BUILD_FILES) build/etc/s6-rc/compiled # No override here so that it can be overridden in host/rootfs/default.nix. dest ::= build/rootfs.erofs @@ -41,8 +41,8 @@ update-file-list: # including files that aren't intended to be part of the input, like # temporary editor files or .license files. So for all these reasons, # only explicitly listed files are made available to s6-rc-compile. -build/etc/s6-rc: $(addprefix image/,$(S6_RC_FILES)) file-list.mk - mkdir -p build/etc +build/etc/s6-rc/compiled: $(addprefix image/,$(S6_RC_FILES)) file-list.mk + mkdir -p build/etc/s6-rc rm -rf $@ set -euo pipefail; \ dir=$$(mktemp -d); \ diff --git a/vm/sys/net/image/etc/s6-linux-init/scripts/rc.init b/vm/sys/net/image/etc/s6-linux-init/scripts/rc.init index 1016d0c62bc6103bc9e865a389f5d482ef6c2b76..5b3261f0356f6615bac4e1aa33352f15d4842317 100755 --- a/vm/sys/net/image/etc/s6-linux-init/scripts/rc.init +++ b/vm/sys/net/image/etc/s6-linux-init/scripts/rc.init @@ -2,7 +2,7 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2020-2022 Alyssa Ross -if { s6-rc-init -c /etc/s6-rc /run/service } +if { s6-rc-init /run/service } if { mkdir -p /dev/pts /dev/shm } if { mount -a } -- 2.51.0