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 084F4B93B; Wed, 26 Nov 2025 19:42:17 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id C1645B7EB; Wed, 26 Nov 2025 19:41:59 +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-x112a.google.com (mail-yw1-x112a.google.com [IPv6:2607:f8b0:4864:20::112a]) by atuin.qyliss.net (Postfix) with ESMTPS id 4DACFB82E for ; Wed, 26 Nov 2025 19:41:54 +0000 (UTC) Received: by mail-yw1-x112a.google.com with SMTP id 00721157ae682-78a6c7ac38fso1844827b3.0 for ; Wed, 26 Nov 2025 11:41:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764186112; x=1764790912; 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=S9VX4Wwm6Gu8sDkxRY5IZbodfOdqEkYeGpnLMouiQXg=; b=C6S6RiwLy7jZHDEWvwlbo5kwiJ/FySkvCOSKvS0yFpS6mlsH02rqQ4GbbEDlfnxq0X /tW0wsyASZxeAuj4QCqoPCB8MCw/30gixIWb1jG7cT0+EIsHz9zI4Ba5GhkrrKk0npTq 6w2gYYMzAs3lJc5jfVSKZyN6X/ETILhqVPTlG2E0NfjBI8QOM/cODi4wpCJGM0zknA1i Wb5GVVA0O2Q1yixYQBVZk7pJ9E3sSAcZdaJI19vVnDmyzYWna72XrVsa3KsmFCVRfgYb cwxrJYIuE8ShbEneIQFw4rBMAQb9qw5p8OsLNl2BMcx+liXvm4s7la7TeBZKH2KllVm8 sKOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764186112; x=1764790912; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=S9VX4Wwm6Gu8sDkxRY5IZbodfOdqEkYeGpnLMouiQXg=; b=vQ+LT05xHzYyWaq/Q3D/QMxLr5YLERDViw7MCNbJz6OxZDKKAYhBF6oDxwBx9pOW5y 7tNC+F2Uj+gFW2Rg+uMHW5ozth+/55noOYA8pmPhy5EiTwRiyOfN6mpk0W8lvEfPA1YO twn79Q6DBvdgHxuChBc8AopjnwEkEBHAQggmwSdDFNp/ANIHaMMwk6FtAsNE/+BOXCx9 1v891UnoryG9iz44UmkTZPRHuIVQ/e48aaZgspxh+tmkBeYpHFi19AS4l2mVqcEBdG+A 6OQK2r0KAwwXVHbrETeSh1WB3Qe7JPflQDeccVU03GB2BW51OlVi/UQz4j73fPBxH/Zy U0Vg== X-Gm-Message-State: AOJu0YxuNJvOSFxyYrggI6LjoWIGV5w4RsUVjxmCBTZJtl0a8859jyjV u/Yt86GGJ0nZDOCesJbKOG1MHHaqYydJWukEb3784ufLsUNfq6Hx2tEabZrRpA== X-Gm-Gg: ASbGnctsLl1s7TLNo11t7o47fb8MFJ14hjv1gmajNzlwOjLV/qVxTkn89AAjZ0QJgsy LcPm1Qy35GnFuuFT9W0t01jQv882EywGtUHdjKinrhSfQ5SAhFuCqQ0HzLKHKIuVYmGj/5h5lX2 knxjeVrzOaphjC4oqIL6QldlsKnGLK7cd7WKaCitEnXfbVV9rVgVyZBpoRgZ3YuQbh8c0T3Fzlm WLC6rLxTWTdsxPeWg06WB/TLVsXtHCGrEStmxdM7tvEwde+wuagHLyeJ9sG0mJYbrzHXDE5uGDg fyu7kQaY2s6g8V57i4Q16n9E/w9rTyszVYzS9hnRC8Yj3U5QXlh5JxjjCexObzDBWTuYADwJte0 tHGENwsl1JGP1IYj+IOPMmR6yF08d86hV8MxCI6cbl3QYQDi0SBc+o8heBOrsnmujTEh3Ro3QG4 HuuFKMXvEbYIVe+YrZOjjz5ZYqokb+ha3c11UxdsuDhftV+2flJ+PEozGb3d9Tvxci134uYgAHD TbeelVIbZSWW6SBlQk8waYAR48Yra4cOf0= X-Google-Smtp-Source: AGHT+IHPzdefo9wboTV3R0fyu0oXYZNMsu5CBy4n1QJ4SNnIhnHNysSAmFIzxjKdF3X133/83sm3Ww== X-Received: by 2002:a05:690c:6c0d:b0:787:fff5:b111 with SMTP id 00721157ae682-78a8b4982c6mr165665997b3.28.1764186112049; Wed, 26 Nov 2025 11:41:52 -0800 (PST) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-78a7992599bsm70222997b3.34.2025.11.26.11.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 11:41:51 -0800 (PST) From: Demi Marie Obenour Date: Wed, 26 Nov 2025 14:40:50 -0500 Subject: [PATCH v5 10/13] release: Create directory with system update MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251126-updates-v5-10-fd746748febd@gmail.com> References: <20251126-updates-v5-0-fd746748febd@gmail.com> In-Reply-To: <20251126-updates-v5-0-fd746748febd@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764186041; l=2715; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=Mgvu8BW7eP72ntsSRlKgf49gg6rmDfEroz6Z2q3E9h0=; b=N6acokHzWjzUFO4XLCyT1j/1H6XFmcqehTdIAq+u9vodzD261du8DeiB7MX8wOP8ma9MmB6pn 1/HNdlsqHNSC0PUJm2pgHppQsym9am0gmBfmsgtYfdKOoP9Vlq96ywE X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: RKSEHMWXGOSK5GYAPLYTQFR6PQEM4VXK X-Message-ID-Hash: RKSEHMWXGOSK5GYAPLYTQFR6PQEM4VXK 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: Whenever a release is made, create a directory with the release files to be used for an update. After its SHA256SSUMS file is signed, the file is ready to be uploaded to a server for users to update from. Signed-off-by: Demi Marie Obenour Reviewd-by: Alyssa Ross --- Changes since v4: - Only set -u because stdenv sets the reset. Update comment. Changes since v2: - Use UUIDs to name the rootfs and verity superblock. This will allow systemd-sysupdate to set the correct UUIDs on the rootfs and verity partitions, avoiding the need to use labels to find these partitions. Signed-off-by: Demi Marie Obenour --- release.nix | 2 ++ release/update.nix | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/release.nix b/release.nix index a4fe66ee5925aeee3a1f5f1fac249c595cee0885..704abb39a3d01152eac3dfe313066834c3cd0a66 100644 --- a/release.nix +++ b/release.nix @@ -8,5 +8,7 @@ import lib/call-package.nix ({ callSpectrumPackage }: { checks = callSpectrumPackage release/checks {}; + updates = callSpectrumPackage release/update.nix {}; + combined = callSpectrumPackage release/combined/run-vm.nix {}; }) (_: {}) diff --git a/release/update.nix b/release/update.nix new file mode 100644 index 0000000000000000000000000000000000000000..18a91ac1eea56e9b2a941eb08244b3dee613b721 --- /dev/null +++ b/release/update.nix @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2021-2024 Alyssa Ross +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour + +import ../lib/call-package.nix ( +{ callSpectrumPackage, config, runCommand, stdenv }: + +let + efi = import ../host/efi.nix {}; +in +runCommand "spectrum-update-directory" { + __structuredAttrs = true; + unsafeDiscardReferences = { out = true; }; + dontFixup = true; + env = { VERSION = config.version; }; +} '' + # stdenv sets -eo pipefail, but not -u + set -u + mkdir -- "$out" + cd -- "$out" + read -r roothash < ${efi.rootfs}/rootfs.verity.roothash + if ! [[ "$roothash" =~ ^[0-9a-f]{64}$ ]]; then + printf 'Internal error: bad root hash %q\n' "$roothash" + exit 1 + fi + cp -- ${efi} "Spectrum_$VERSION.efi" + cp -- ${efi.rootfs}/rootfs.verity.superblock "Spectrum_''${VERSION}_''${roothash:32:32}.verity" + cp -- ${efi.rootfs}/rootfs "Spectrum_''${VERSION}_''${roothash:0:32}.root" + sha256sum -b "Spectrum_$VERSION.efi" \ + "Spectrum_''${VERSION}_''${roothash:32:32}.verity" \ + "Spectrum_''${VERSION}_''${roothash:0:32}.root" > SHA256SUMS + '' +) (_: {}) -- 2.52.0