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 1EC0C7FFB; Wed, 29 Oct 2025 10:14:28 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 284A9801C; Wed, 29 Oct 2025 10:14:23 +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-xb133.google.com (mail-yx1-xb133.google.com [IPv6:2607:f8b0:4864:20::b133]) by atuin.qyliss.net (Postfix) with ESMTPS id A3767801A for ; Wed, 29 Oct 2025 10:14:22 +0000 (UTC) Received: by mail-yx1-xb133.google.com with SMTP id 956f58d0204a3-63f533fbff7so4219250d50.0 for ; Wed, 29 Oct 2025 03:14:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761732861; x=1762337661; 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=VM6NEuvyYG03OEyzwJRoPTNqYqBssupyGfrs6sufmlU=; b=IKNmvLXlMNzSo5Nqc6arAtr6+bKiroOGfYgEpCzek9Db+Sp5FT5UnzgFO66m2Bhpe1 /jvWo39uRZfh4GCEoTJettPlIfyJs2xgGmf2ydXmFOlZVaw2iWg/BDjY+EpnwnYY0dSX yVaGl1tNJ+V9SgDBJevfhALi5h0fadx897Ufp/jXKxLLDOEvVCL+HOKP83GUiVKkfDee dArMjEzHHIMrKrJ2fbtnOnhurGMY7ZtvYgK452xe/muXwUsUMg6lUrDglFZzd340Elkl J6jYRGN9WGtcaLKsEYPG0d8ESmxwn4gjV3m4icdnOGpp20JEEizkes2I0TSj08+XpIK1 vuxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761732861; x=1762337661; 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=VM6NEuvyYG03OEyzwJRoPTNqYqBssupyGfrs6sufmlU=; b=CoX8CEA3gf+2fDgF0bUbvXR18d3B48fvWgBeze/I8GXGywt4OxqBZRCaA7b5s7wK0h nXLwDZdUZ0I5GHaRLmRiRux9Cg6Ecbc+FerafXzULtHWZPcgig1ZFSNUQRlHFUkSeA37 wVBIMb2tI6foShN0fOo2+dHb1BbAs6vPZs8qjSEWxlWt8KVEQvjNBZnTfmC9HQj/a2sm EmTTq2M738XBXcff/vZ+igaqkww+N59XrlToWx2A6roKdPTqR8RJLwCa9u/OKuDxakpd T5Q61uRmXyzu5iwA0lW7myi1H1n3gEGezathhSEpmUjUoIPDCSI2mWwsO5ayQU/5xlK7 SLQQ== X-Gm-Message-State: AOJu0Yw0c4gRcDyXz0J3L6/s6PgkQkU3lhEtDz7ta6HEs61mBEMClwPI R4aNWi3cMF1vWsvhzcisuxNeBkouJ1c6KQWh4GCa9sG3+25CJ5uAKvTbSAB3AQ== X-Gm-Gg: ASbGncvXzXaxJRJxBnkRDbxijcswxEGDdk0ezklNLex2bBNKpZOJfA7NEeXb1nM8DCG 1Ad4YwZeyq/tysCnrq//hjRWhtrnkNoBQxPtvlMuOj4MH1jIHt95R8arUoIlzDik1jr+gdBEUmg R4B9DUsD9r2Ae9A0Se+GBbMRs40HTWd3f981pFkNv+SEQG4Y2zguijQy7INIB2gSG2JO/Bf51yT d4f8HPX2XQDe5n3SiF6/R4sRAaMHQxS8x5mrnK/2JuXjaGC72qZCAJ7FFSRxzkBqsXS8lXw3s6T b6zp3WHFVqIF3AizG1UXDaUUlTKu7SZXrdbmRIh7p8YBUTD+0IIiR7voghUY8eUrS5h9+zcEP30 31fi+JHB6RJv5upk6YXGYLR1N+ZAKgskRrG0d+j9eBppAQCMuDs5sX5hSdzCP/CXdP9V4vL3S26 jJs/26Xd0w6tA2/4TUfX23RdLTABB+ATaZPJZ3LmT1i9hmka2iqY3b6o2ii54QN+Tu0sIwjdjIy W4csUgg+1m0x+/EYwh6eRbq X-Google-Smtp-Source: AGHT+IEjRxK3OGhrVFfePDqmANDIVoGNHi0rTgGT9q5+Vt/1asyG4hrj8viK5ocTUN+rD4ioOgT5Xw== X-Received: by 2002:a05:690e:d08:b0:63e:34ed:a11f with SMTP id 956f58d0204a3-63f76d0f252mr2125906d50.27.1761732861314; Wed, 29 Oct 2025 03:14:21 -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-63f4c45491fsm4062670d50.23.2025.10.29.03.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Oct 2025 03:14:20 -0700 (PDT) From: Demi Marie Obenour Date: Wed, 29 Oct 2025 06:12:41 -0400 Subject: [PATCH 2/7] release/combined: Compress installation image MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251029-updates-v1-2-401c1be2a11b@gmail.com> References: <20251029-updates-v1-0-401c1be2a11b@gmail.com> In-Reply-To: <20251029-updates-v1-0-401c1be2a11b@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1761732759; l=1974; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=ewuu304vlKJ6c/8b0R1hauJ4hzEp12oAwkkLIwGRVn8=; b=muXKHqowxGWaFBOZjXjFKN/z+av1GKQc1TvXe6bYe8aCJMqknSXlHD2yPjZGmlRmXqjDbB5xa TAyfV0SJzdyD0VZxMzWTaMVX6MfaMmeSoFvnPh4CsoKEFUaBIwznNoh X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: ZCPV3I3ZX6W2MYPNGQD4WWJTVGFCQAFD X-Message-ID-Hash: ZCPV3I3ZX6W2MYPNGQD4WWJTVGFCQAFD 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 will be needed once the B partitions are added. Otherwise, tar2ext4's size limit is exceeded. The timeout is increased to account for the very slow compression process. Signed-off-by: Demi Marie Obenour --- release/checks/integration/meson.build | 2 +- release/combined/eosimages.nix | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/checks/integration/meson.build b/release/checks/integration/meson.build index 7bf8f51e4c762d2279ed6064ae1a87cb9b07494c..eb2860c6871b1067891c07ff7f4ac634cb4af458 100644 --- a/release/checks/integration/meson.build +++ b/release/checks/integration/meson.build @@ -13,6 +13,6 @@ lib = static_library('spectrum-integration-test', 'lib.c') foreach test : ['appimage', 'late-serial', 'networking', 'portal'] test(test, executable(test, test + '.c', link_with : lib), - timeout : 400, + timeout : 800, args : [run_qemu]) endforeach diff --git a/release/combined/eosimages.nix b/release/combined/eosimages.nix index 0ac4c48374e7098a2b91f61fc07cebb2042ffbdc..ba44d9cd82d55d491293ed36cc0402db8ebd3ffe 100644 --- a/release/combined/eosimages.nix +++ b/release/combined/eosimages.nix @@ -12,11 +12,15 @@ runCommand "eosimages.img" { unsafeDiscardReferences = { out = true; }; dontFixup = true; } '' + set -o pipefail mkdir dir cd dir - ln -s $image $imageName - sha256sum $imageName > $imageName.sha256 - tar -chf $NIX_BUILD_TOP/eosimages.tar * - tar2ext4 -i $NIX_BUILD_TOP/eosimages.tar -o $out - e2label $out eosimages + ln -s -- "$image" "$imageName" + sha256sum -- "$imageName" > "$imageName.sha256" & + pid=$! + gzip -9 < "$image" > "$imageName.gz" + sha256sum -- "$imageName.gz" > "$imageName.gz.sha256" + wait "$pid" + tar -ch -- "$imageName.gz" "$imageName.gz.sha256" "$imageName.sha256" | tar2ext4 -o "$out" + e2label "$out" eosimages '') (_: {}) -- 2.51.2