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 4428BCEFD; Sat, 22 Nov 2025 01:28:09 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id CBE6DCDFB; Sat, 22 Nov 2025 01:27:52 +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-x1130.google.com (mail-yw1-x1130.google.com [IPv6:2607:f8b0:4864:20::1130]) by atuin.qyliss.net (Postfix) with ESMTPS id DA93FCD53 for ; Sat, 22 Nov 2025 01:27:46 +0000 (UTC) Received: by mail-yw1-x1130.google.com with SMTP id 00721157ae682-787eb2d8663so40606327b3.0 for ; Fri, 21 Nov 2025 17:27:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763774865; x=1764379665; 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=BWuhQ76NszhY8oa86EGi7xCPc218X2YBBLAknXwSV+M=; b=TjJbTQach5pFpbPG7ULVEth+eX3QObcYbEG5016C+kt0Tl3pfezo766XU1vmJ5gAeD jmclcJDCMdE1a5bEIVsQ43Y45HTwE6O6QOZJkccv3bsvlJWNMrQRcH1GhwSi/+glkR4t sX05QIvoBMrBWdIhE9y2CtTQvrqtSHp4uDOYhgQHFFrU+FsfX2lTUmNR8Tmtd7kBczN4 MBc+77qfWTM+yL+iHOwvfaFhrry8UHO4X234oBCda6pFNP1+8sFxhGP9UV2GwY3RqV/b vxAymeA3p++huygHSGPXfxR417HUmMav41bGWnJ1DH8jQWU5kZJcVjTZ0nIg0TNcfxyP TDRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763774865; x=1764379665; 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=BWuhQ76NszhY8oa86EGi7xCPc218X2YBBLAknXwSV+M=; b=uNGYeFPsXRjSGiEmHhbaB9IpUOeuKagd0nFzk0iZWsvMCAfwCoPrgcS0C5Fx0ZR0EA Pv8gnCozBkoRR6H8oMiKj6I+ER14aVnUHHgB1QcfkPLaxLcz1Ts/Y8Py8htyhZGLCh0N u6Fh8+VLen80i2DI9h+5A/aae+G3kniMXXV7ez+9c0WhEIpLagDBAHhyAXOPA6CqpxzQ LyGbLl8NA8tOVrVd++40Nvi/ukBTQHVck/txoOIpdHoXN/T1UsfVspetaZkjSYyjUisb JrdEovzyiET8S6Xu7/BQE7pp15T1MgXh4Ftr8NzvWaQVOtbieDeSd1J/vZ0e9CJagdHZ wAig== X-Gm-Message-State: AOJu0YxEXdPXRO5F2OsP6KaCHFdj3mvjEOFswiUTfQqRfGTsAeKG6JCh XVDieFOz/7jjov4jDVDyeOmHwgLj0c0DMyer72MuEHSXlCWWbXDViHQymjESVA== X-Gm-Gg: ASbGncumZOSIKo7CA5cHQM3Xf9pwlx6oYVW03XFJEDV5gwP16Lh0XmOOOLtoSLamjDp g1JE6YzF8BXkTP+fCqYkofWzBxCp9raZlXAVIdijDgZJ0gvoKpO8MBip3d3wtlmhtPhhg9oJ+xT 91bjzYaofpnRkyLjV6aAuU2XTQYRwv9qJkABXCcfeFSCchwkhzN1Gm3JtTbd0HyF3RPbrBFyqel lEGy/jwiRGRxpfhkE6Ozqg5VC+xr7e67LPAYKEaUWZgkwmuXls6KMJ6Gy5JOkMKX0pBnMlQ2Ahq caxQZKl07puanTgb9f9wMGWygW1rUOGaE3kH/Ax/n9Yvz0KmREX2KLNhe20R3m9sSOWGTfdCUPU w0bjWAO4ycDjIAL6voRes0d6g/g//qRh1iQ/nrO7prM1Z4orUAJVqr/MPxIa/vYOYbtUIZRuoGV qMSf7Akn8mCIuho/7QeAWCyagZoBaCuq7dJ0bjR8+BakkVMkABDZPSA3YE0nRTAMDoZLvN936To qTCEI5U2sMhPofY2C0aR9WI5KQ9ggf7h9M= X-Google-Smtp-Source: AGHT+IGxQJFAXQSn9UfEYZJuppgZD4o4NKp6TUfLD9IOU1/M9xdaEeNmhH4b2OYV3ssUvFYEl6kw9w== X-Received: by 2002:a05:690c:7009:b0:788:1409:699d with SMTP id 00721157ae682-78a8ab0c960mr35312207b3.7.1763774864659; Fri, 21 Nov 2025 17:27:44 -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-78a799405f8sm20519037b3.42.2025.11.21.17.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 17:27:44 -0800 (PST) From: Demi Marie Obenour Date: Fri, 21 Nov 2025 20:23:33 -0500 Subject: [PATCH v4 11/14] release: Create directory with system update MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251121-updates-v4-11-d4561c42776e@gmail.com> References: <20251121-updates-v4-0-d4561c42776e@gmail.com> In-Reply-To: <20251121-updates-v4-0-d4561c42776e@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1763774602; l=2565; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=Y9XgbzZuMdzZbqFMy+luoqvuMd2MxJaxF0mF0LoJWvs=; b=EzAaECKuxEmlY42GLa54xHYQghpQGd2FhFbt5IWbym+aZw8R362Y68TQGmo7/ORbaK4ENWdey 8QFlPu3SsvJC9lMvQHdjhPzrw8QUE/womU3TgmlEOEYd2RfstePxHtE X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: HQFDU2ERLFFOLJZ6BQYPYRAT6RDQTR3P X-Message-ID-Hash: HQFDU2ERLFFOLJZ6BQYPYRAT6RDQTR3P 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 --- 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. --- 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..77eb5fc422baa7d13e8e3ccb823c2fe69d2c39cc --- /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; }; +} '' + # One would expect that this is enabled already but it is not. + set -euo pipefail + 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