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 A33DC88A1; Wed, 29 Oct 2025 11:50:51 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id BFB0F8761; Wed, 29 Oct 2025 11:50:49 +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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-b2-smtp.messagingengine.com (fhigh-b2-smtp.messagingengine.com [202.12.124.153]) by atuin.qyliss.net (Postfix) with ESMTPS id 0DB8D8760 for ; Wed, 29 Oct 2025 11:50:49 +0000 (UTC) Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfhigh.stl.internal (Postfix) with ESMTP id E688B7A01B6; Wed, 29 Oct 2025 07:50:47 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Wed, 29 Oct 2025 07:50:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1761738647; x=1761825047; bh=H14UN9ggJL W9G9/PevSV4oegXZ8yawDnByObHlTZPF0=; b=Mk6TudsbxgPU7Ivqg+IU2tv5U2 nPH9UTQuKFVSn00iQONLpy4+pN28Br87RMVsk93iLG/Rul4v7T52k6CtpgSiTXcK yNMwpG5dz74uU7JKysQRrFUSyJXth3wqpbgO0rsxH9ZtEAT0Nu0FfBMzylIcll0a U/b4W68rMfwAlFWKsFF6f9tcSPdjvmS0KAm5NbukO5Phdjen8yhcicIDD7ZtLPlj s6aXNj2ImTJ8YwuMX5RfYWuqtR8u94W1Or5Ih15gJG0fIllSXwZDR/Y0IMK5y5WP XiMKq91R4Ltzs/CfsZgdd8s0aP+37J8UmHvIwHnQ/PN1zOOA2GeHd8tnSLrA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1761738647; x=1761825047; bh=H14UN9ggJLW9G9/PevSV4oegXZ8yawDnByO bHlTZPF0=; b=sQrGMOow13undcMRvJp37ljHzahmsOtATbzEjFTLykY8oQBB02l 7NRKLR4WGgJDxCKq0FLWZh2kBlTDv6Mh4J05/5M6BiNR9KfyFC0jvY/i+Rmo8dT6 VUwKuPXnu4X1irVte9MGyAzuVZsdh8ecDV1QMRvruWufiTNavCEcO2MN//B0C3dF J2OjajXF/nR2XQ2OQQIcrx8rtIAzCRJ62llJCxXwYAuZ07m8NcuJAR3UuV6kl76/ kiuBsiQCY/pUE/0NNyi0Vu51DpeQy8Xkznn+d86PpzMDBwMReEvJf6fR98OtD4vm 3Ow5htV1wWoxS7CcPzSl8iNLnA56txnJAdQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtdeggdduieefieehucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhephffvvefujghffffkgggtsehgtderredttddtnecuhfhrohhmpeetlhihshhsrgcu tfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeeiudffue eilefgtefgtddttdekkeehkefgheekudefveetgeefiefftedvteeuveenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihsshgrrd hishdpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohep uggvmhhiohgsvghnohhurhesghhmrghilhdrtghomhdprhgtphhtthhopeguvghvvghlse hsphgvtghtrhhumhdqohhsrdhorhhg X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 29 Oct 2025 07:50:47 -0400 (EDT) Received: by fw12.qyliss.net (Postfix, from userid 1000) id 73FF35213CC; Wed, 29 Oct 2025 12:50:30 +0100 (CET) From: Alyssa Ross To: Demi Marie Obenour Subject: Re: [PATCH 2/7] release/combined: Compress installation image In-Reply-To: <20251029-updates-v1-2-401c1be2a11b@gmail.com> References: <20251029-updates-v1-0-401c1be2a11b@gmail.com> <20251029-updates-v1-2-401c1be2a11b@gmail.com> Date: Wed, 29 Oct 2025 12:50:28 +0100 Message-ID: <87v7jyj5a3.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: MEMADIGQB626KXO2ODAEMHJPI7BNFFRI X-Message-ID-Hash: MEMADIGQB626KXO2ODAEMHJPI7BNFFRI X-MailFrom: hi@alyssa.is 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: Spectrum OS Development 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: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Demi Marie Obenour writes: > 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(-) I haven't built this yet, so maybe I'm wrong somehow, but doesn't this break "Try Spectrum"? GRUB isn't going to be able to loopback mount a compressed image, I assume. That's why I keep asking what GNOME OS does. We currently produce an image that lets you install Spectrum, or try it out in a live image. Do they do that too? If so, how do they make it so that live image is bootable without being huge? Does their installer resize partitions, perhaps? (I reviewed the rest of the patch anyway, but I think we're going to need a different approach here.) > diff --git a/release/checks/integration/meson.build b/release/checks/inte= gration/meson.build > index 7bf8f51e4c762d2279ed6064ae1a87cb9b07494c..eb2860c6871b1067891c07ff7= f4ac634cb4af458 100644 > --- a/release/checks/integration/meson.build > +++ b/release/checks/integration/meson.build > @@ -13,6 +13,6 @@ lib =3D static_library('spectrum-integration-test', 'li= b.c') >=20=20 > foreach test : ['appimage', 'late-serial', 'networking', 'portal'] > test(test, executable(test, test + '.c', link_with : lib), > - timeout : 400, > + timeout : 800, Did you measure this, and find that it was actually roughly twice as long? I'd like to keep the timeouts grounded in measurement, so this should be increased by an actual measured factor. > args : [run_qemu]) > endforeach > diff --git a/release/combined/eosimages.nix b/release/combined/eosimages.= nix > index 0ac4c48374e7098a2b91f61fc07cebb2042ffbdc..ba44d9cd82d55d491293ed36c= c0402db8ebd3ffe 100644 > --- a/release/combined/eosimages.nix > +++ b/release/combined/eosimages.nix > @@ -12,11 +12,15 @@ runCommand "eosimages.img" { > unsafeDiscardReferences =3D { out =3D true; }; > dontFixup =3D true; > } '' > + set -o pipefail This is set by stdenv. > 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" & What's this used for? The eos-installer README indicates that it looks at the hash of the compressed image. > + pid=3D$! > + 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 > '') (_: {}) Please separate quoting/escaping changes to keep functional diffs easier to identify, and check if they're actually necessary. They never are for store paths because Nixpkgs assumes that. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQQGoGac7QfI+H5ZtFCZddwkt31pFQUCaQH/hQAKCRCZddwkt31p FUu6AP4vM9Mr1FI+GmWUpqtZQ7aQu17XqPJxh6DdeZy39FJAAwD9EquBbCpZeOto av9bZufa+M8O0Cpi9PDIpWp/kkJN0Qw= =Pf20 -----END PGP SIGNATURE----- --=-=-=--