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 4B7DF1ACA4; Wed, 12 Nov 2025 22:18:21 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id ED94E1AB55; Wed, 12 Nov 2025 22:18:06 +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-xb131.google.com (mail-yx1-xb131.google.com [IPv6:2607:f8b0:4864:20::b131]) by atuin.qyliss.net (Postfix) with ESMTPS id 5E2D31AB37 for ; Wed, 12 Nov 2025 22:17:59 +0000 (UTC) Received: by mail-yx1-xb131.google.com with SMTP id 956f58d0204a3-640d0895d7cso272534d50.1 for ; Wed, 12 Nov 2025 14:17:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762985878; x=1763590678; 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=TVsbJU9V7WkZ/Gl1t0y66iuImUSTlV+h7XCWHmgCgfQ=; b=j4LQETIQnEtjj2ZvPQFeY0VtVI0MSiP+Zl/oxcX8zFlmec2f2cGLNFCBXVTJ53/Z2w ENjxQLYBQMsTsIj6TFubGibS8d1dDWsU6P9ueCb0UL4y6mGjnQlhdiDKvCXgYu2b07MG qcVardlAcYwzxG+F/P6FQeOV0Mb6GqaO1EVatYA0Hmk+HtsoAbAf+H+XLbhPJ75R/hz9 c7dqxBPW3iJEsS8pUA+3aOz52s8T7IJkJZfCjWgSRIz7eBd+0hkvW1RL3mdSZXfcLDn7 qYZLITSWkJRrHlth7QBzLoyUs4n9nf5KHHGtZ4ul5tzHG94AoHWCo1EB2wq113520k7P AdyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762985878; x=1763590678; 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=TVsbJU9V7WkZ/Gl1t0y66iuImUSTlV+h7XCWHmgCgfQ=; b=bhNK8pducsYduYTRIkO5USZplfvk3Doo59k6tYRZ1EEGk0N+HBbXmab9BBJkpD34sk IAU96lKWi5YINolDw/2QYJ2ruBdKwpsFrIXrRhw5o76GdHuS/56MwngTYS/oBkBhYMLs PGmVvoPda6QYRWzQk7IC8cn2ZdocAfvq4jiFw4h6a/yajNg6IQ47k0rOGovZro047bQc 6HdkhYTXMXdo0c3wBWgTF7cXkLidVy53Tq3fnkPH2mYvY+S8U0kFtkw8iD7W0/qCAgF3 24EoTbCOh92zBhG0697o/+ZQ+sFJ8pbn6lyo13h3406bdGAQQf/QUUavJn0Jl6Ytl7A6 yi2g== X-Gm-Message-State: AOJu0YxVeoId8xE3aHNyKNYePujWe2hOC3+QM05H2IkA92JPVPWKys9p XvqMazRgfXidhgx4pjDtRZaTNvxFqXd3c8NSVbdkBNORbixRcP9n/pNvv6yqRo+d X-Gm-Gg: ASbGncsWPBRGPDGcaNwusnmVFY9Dk5+ipFAEowY38GSzpD5KBNSBRzQjoOZxy2RgDvR aokNhGAfgMTp3pc2/arqQRTX1GpXGDJwBs9plXHS7rPrIcTUOeMZKQ/jX7QSSfXqM3WBn5zARop phv47D7WloEmoejN0O4o8BsYtZjWRgbrQt8ncMq0ubULPi20kLajm9Iis3S8mR/dpfYacKzHwkO QwBgVC8Q8xTso37Bh8w0HvT8bX1LDWJdIOPEDk5+9sXQJXM2EK6810NGc+oedjQtKLBP+MU5V4W 7u5UfhTiqgrguH+N8QUkhPdLBRKmAyaj2nKYcPPQIvP/tea41VtKcB7fkmRLxjTXj3WJIHXWp9W 4bE0IYhVfsWWEhNx5SdL8GS0yeG1HKDlyqSx0bNDFEnRfzvACtwkc2Gt2bk2v0XXkIcE67FTD0c MAF8Ofl9NwhDM59gJGQUYREWK4LyrJ6QLFKtQ3mto6v378BpgvsXDG6sny2ykDLnJEKitfFx4Lt B5gcZay6xLQ4yECpDFyiEjbMR+q8KNTHxk= X-Google-Smtp-Source: AGHT+IHVp44PNOjp6UW9R+f7/p7mHnAHY3qBH3naIzGRjYeH9mb4xqmxejhKFO+i/CcUuD323+JffQ== X-Received: by 2002:a05:690e:428d:10b0:641:597:dbf8 with SMTP id 956f58d0204a3-6410d0d42fcmr720103d50.19.1762985877665; Wed, 12 Nov 2025 14:17:57 -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-78821de2c15sm1005257b3.1.2025.11.12.14.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 14:17:57 -0800 (PST) From: Demi Marie Obenour Date: Wed, 12 Nov 2025 17:14:59 -0500 Subject: [PATCH v2 5/8] release: Create directory with system update MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251112-updates-v2-5-88d96bf81b79@gmail.com> References: <20251112-updates-v2-0-88d96bf81b79@gmail.com> In-Reply-To: <20251112-updates-v2-0-88d96bf81b79@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762985694; l=2081; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=w5MvFGb5fIUkDJE44J0+H4MA6Bxi2cjh0sMHNSj2lcE=; b=qKyuQHn3oyc8hpQS+ryi771n0OwoJzBnh5iA4rWAC7fdILIMYUpCeePqZbVgxfl0p+zbH1q8M R0q5FDwxc4rA2o3vKbNf7i0puMwfqH9/v/4L5XCDnXjIPVHzq/PkCAC X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: E7RR43HFE54SJFGZQXX64NOX4S7Z66VM X-Message-ID-Hash: E7RR43HFE54SJFGZQXX64NOX4S7Z66VM 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 webserver for users to update from. Signed-off-by: Demi Marie Obenour --- release.nix | 2 ++ release/update.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 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..ec51eb12d33030255b7b4a7e74e14416f1f0659d --- /dev/null +++ b/release/update.nix @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2021-2024 Alyssa Ross +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour + +import ../lib/call-package.nix ( +{ callSpectrumPackage, config, efi +, runCommand, stdenv, rootfs +}: + +runCommand "spectrum-update-directory" { + __structuredAttrs = true; + unsafeDiscardReferences = { out = true; }; + dontFixup = true; + env = { + VERSION = config.version; + ROOTHASH = "${rootfs}/rootfs.verity.roothash"; + VERITY = "${rootfs}/rootfs.verity.superblock"; + ROOT_FS = "${rootfs}/rootfs"; + EFI = efi; + }; +} '' + read -r roothash < "$ROOTHASH" + mkdir -- "$out" + cp -- "$VERITY" "$out/Spectrum_$VERSION.verity" + cp -- "$ROOT_FS" "$out/Spectrum_$VERSION.root" + cp -- "$EFI" "$out/Spectrum_$VERSION.efi" + cd -- "$out" + sha256sum -b "Spectrum_$VERSION.root" "Spectrum_$VERSION.verity" "Spectrum_$VERSION.efi" > SHA256SUMS + '' +) (_: {}) -- 2.51.2