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 D0209B420; Wed, 26 Nov 2025 19:37:03 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 0195FB34B; Wed, 26 Nov 2025 19:36:57 +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-xb129.google.com (mail-yx1-xb129.google.com [IPv6:2607:f8b0:4864:20::b129]) by atuin.qyliss.net (Postfix) with ESMTPS id 6543DB346 for ; Wed, 26 Nov 2025 19:36:56 +0000 (UTC) Received: by mail-yx1-xb129.google.com with SMTP id 956f58d0204a3-63e19642764so110969d50.1 for ; Wed, 26 Nov 2025 11:36:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764185814; x=1764790614; 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=JTqd6ISISHLRnykjLh6pUg8F1vpqhe+qRF2nzRjTfwM=; b=lBAVS7WMkTB35ucp2sx6GOEUx2hhJ7jLIJW3DlE1kT6ncRg90hPuUbuzf9vKQEzo3q wacx+byLg5kgP/lOPIJfARXwXIT30gdyHrcNSNN15j2gmuqFnhpJCwn6LD5wh1NN0Vz1 oj7itOKf2D7W7TnB1xnECCTwlQyNc4tcYJK3TCulGbhgIY+vCEgLgdp7BMxykMWUOa0P qdvKQfE29WWsjHDxQgDuva5iRo9EZqqHqZxCW5cG4/fAHkxj/yx4O5+1OZYfwcw0ZNa5 ukqwPFnjP/M9NTPJ4TFvR+2R1gT391zwhqoshftki0JRhLIBPs00SfrGlUsNH8AjHA3v Oybg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764185814; x=1764790614; 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=JTqd6ISISHLRnykjLh6pUg8F1vpqhe+qRF2nzRjTfwM=; b=dbAf6mnO7LAug7Gqs9Tr9Pec93NudFbUCh7erdty2DYeV4tfVVl3OrH9WKDFQLYMT6 +qzPdsB05fwKzCO9JObtFRSrqk5u3yYiqDluCFu/D5xv9YnksuaMJ2y+N487oXYM73Yj y1Hw9vQ6FdCJCQNdO4zvzBwwsh1fDzditYy0tsB4UaH5equnzrqQcigUZY2gLIfCqqYT CanxCaRME2iEpkc+MReTQTAV8oFJuOgVpdTanfqvOPqCmz39LmPJsTuthsAHCZT3d4ru 5tXC3DEAzQdSyXQ79pZU567JGmT7wizoNopV+J9sX+o2ltyKgd+e0Hu3iDPsNggxLPvY d1kQ== X-Gm-Message-State: AOJu0Ywmm6EUHwLjxeXkyZZqQBofrurp/A8sg/FSxwmQYDAza3vmM+FI quY3jhuCaxYLz68tLNMdsKuvTfmtYuSs7Vjm8Pvga90Wu5DiEZq0Y3H3Ro7D9g== X-Gm-Gg: ASbGncsJ67MwSIjpaDP3Fd/RvmsFrPlnTBkWvzV/eoZOcDOOt+31gEiV19O1GVyLZwQ l17zZ6lN7/jPZvnz0uKRjZfVMArlMC90mMYh0TuJlcjyXLq3ToNT795rZnBLIx6G9sHTlpwqf3v 0FRpYTf4G1NHUPEGH9eeYHoxgHvafx/OM8Y5Oxej56KnfioxcYSq+V5x+a9q/ZSRg1O4+lfosGC Qo19zNlNIjj2zV74MDb351LlTx/M26r/IFQw6ndmen4YjP2BlGZzmtUSLMGJSNbAy5WqRE+dEBE 4hhpVIZvN6kI0kK0S6rZlkDsX4iaslK8fYmwih/VLkCDPO1li0GsBZ4bUy3i7rCXLVEEGO4RY8l GSnD37zXH6oHumRet8FgfEtrvsKgBiviRIxlJzgSXvVkQ0ezG8VKl91FePyfBasBS8eo58qO7tx suarSbL9Pu8oId8dF6eSqLOzzOW98j15XHl+9dHNU+bUcDtBd5pvNgEq2YZSx8EdD0MLZj/4ydE 6xTmVGq1uYgp3rVXHEugrTEB3dqU2j50Ls= X-Google-Smtp-Source: AGHT+IF4qhvNansOUkYK4++c+3vBY0p0xoAj8f0HqOVYjKduqM00vIllGNY3ZHpYP2KTPC58WxxdXA== X-Received: by 2002:a05:690e:4089:b0:63f:bcec:35d with SMTP id 956f58d0204a3-64302a3a7b0mr15226725d50.17.1764185813854; Wed, 26 Nov 2025 11:36:53 -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 956f58d0204a3-642f718b7c3sm7585212d50.19.2025.11.26.11.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 11:36:53 -0800 (PST) From: Demi Marie Obenour Date: Wed, 26 Nov 2025 14:34:00 -0500 Subject: [PATCH v4 02/13] scripts: port make-gpt.sh to bash MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251126-updates-v4-2-40c438d2dcaf@gmail.com> References: <20251126-updates-v4-0-40c438d2dcaf@gmail.com> In-Reply-To: <20251126-updates-v4-0-40c438d2dcaf@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764185638; l=6204; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=/RZGdJFUz1f6qgMbkzHOscQbG4DiZBPkHqhqQTGct30=; b=Cx9MFssUYbGnc8mTd/EZEoz/r5XpQ4FV9lNNcbuCNEebOBHN3UA26yEwmdp4RAVHVrIjFnFuV CL0OGbK1VStANh3sXimlKziVNBDFb8sGHXGU/nedBJrtJgcxsQYjP06 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: APQ7RMUA65L2TFMFZ4QWTBVR7DDYPQ7G X-Message-ID-Hash: APQ7RMUA65L2TFMFZ4QWTBVR7DDYPQ7G 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: Future changes will be using bash-specific features. Use bash-specific code for this. Also add some error checks. No other functional change intended. Signed-off-by: Demi Marie Obenour --- Changes since v4: - Improve commit message. Changes since v2: - Do not use wrapper script. - Make script non-executable. - Invoke script as 'bash FILE' to work around /usr/bin/env not working during a Nix build. --- host/initramfs/Makefile | 4 ++-- host/rootfs/Makefile | 2 +- img/app/Makefile | 2 +- release/live/Makefile | 2 +- scripts/make-gpt.sh | 20 ++++++++++---------- vm/sys/net/Makefile | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/host/initramfs/Makefile b/host/initramfs/Makefile index f27f5e07c4707914962197b4fea8f385729370aa..2304b0885a152d8a659dddcc58f948d096034e2d 100644 --- a/host/initramfs/Makefile +++ b/host/initramfs/Makefile @@ -36,7 +36,7 @@ build/mountpoints: find build/mountpoints -mindepth 1 -exec touch -d @0 {} ';' build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk $(ROOT_FS_IMAGES) - ../../scripts/make-gpt.sh $@.tmp \ + bash ../../scripts/make-gpt.sh $@.tmp \ $(ROOT_FS_VERITY):verity:$$(../../scripts/format-uuid.sh "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ $(ROOT_FS_IMAGE):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))") mv $@.tmp $@ @@ -45,7 +45,7 @@ build/loop.tar: build/live.img $(TAR) -cf $@ build/live.img build/loop.img: ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/loop.ext4 - ../../scripts/make-gpt.sh $@.tmp \ + bash ../../scripts/make-gpt.sh $@.tmp \ build/loop.ext4:56a3bbc3-aefa-43d9-a64d-7b3fd59bbc4e mv $@.tmp $@ diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 4cb048ac08b3265b0435d6ff6fc612a58c169ce9..f45758041f2f682618cb0f9e54e5a74f0b49874e 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -93,7 +93,7 @@ clean: .PHONY: clean build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/verity-timestamp $(ROOT_FS_IMAGES) - ../../scripts/make-gpt.sh $@.tmp \ + bash ../../scripts/make-gpt.sh $@.tmp \ $(ROOT_FS_VERITY):verity:$$(../../scripts/format-uuid.sh "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ $(ROOT_FS_IMAGE):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))") mv $@.tmp $@ diff --git a/img/app/Makefile b/img/app/Makefile index 48eba871339d314479f730101246ace3fa39e2db..f16c2df1b90bbec6750f2980da4dbaf49c9cb0ea 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -26,7 +26,7 @@ $(imgdir)/appvm/vmlinux: $(KERNEL) $(imgdir)/appvm/blk/root.img: ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/rootfs.erofs mkdir -p $$(dirname $@) - ../../scripts/make-gpt.sh $@.tmp \ + bash ../../scripts/make-gpt.sh $@.tmp \ build/rootfs.erofs:root:5460386f-2203-4911-8694-91400125c604:root mv $@.tmp $@ diff --git a/release/live/Makefile b/release/live/Makefile index b37ccce42feb3ac7e8ce4faf96a67902b55be808..c712db3727b7008105388a278552fd3d81eb3b4c 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -10,7 +10,7 @@ DTBS ?= build/empty dest = build/live.img $(dest): ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) - ../../scripts/make-gpt.sh $@.tmp \ + bash ../../scripts/make-gpt.sh $@.tmp \ build/boot.fat:c12a7328-f81f-11d2-ba4b-00a0c93ec93b \ $(ROOT_FS_VERITY):verity:$$(../../scripts/format-uuid.sh "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ $(ROOT_FS_IMAGE):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))") diff --git a/scripts/make-gpt.sh b/scripts/make-gpt.sh old mode 100755 new mode 100644 index 96f0d2c8494c093558c0e32e7e920b569bb078ef..0ae3d0005e5ae7d6214270fedb2fafb0a7064cf5 --- a/scripts/make-gpt.sh +++ b/scripts/make-gpt.sh @@ -1,11 +1,11 @@ -#!/bin/sh -eu -# +#!/usr/bin/env -S bash -- # SPDX-FileCopyrightText: 2021-2023 Alyssa Ross # SPDX-FileCopyrightText: 2022 Unikie # SPDX-License-Identifier: EUPL-1.2+ # -# usage: make-gpt.sh GPT_PATH PATH:PARTTYPE[:PARTUUID[:PARTLABEL]]... +# usage: bash make-gpt.sh GPT_PATH PATH:PARTTYPE[:PARTUUID[:PARTLABEL]]... +set -xeuo pipefail ONE_MiB=1048576 # Prints the number of 1MiB blocks required to store the file named @@ -40,16 +40,15 @@ scriptsDir="$(dirname "$0")" out="$1" shift -nl=' -' table="label: gpt" # Keep 1MiB free at the start, and 1MiB free at the end. gptBytes=$((ONE_MiB * 2)) for partition; do - sizeMiB="$(sizeMiB "$(partitionPath "$partition")")" - table="$table${nl}size=${sizeMiB}MiB,$(awk -f "$scriptsDir/sfdisk-field.awk" -v partition="$partition")" - gptBytes="$((gptBytes + sizeMiB * ONE_MiB))" + partitionPath=$(partitionPath "$partition") + sizeMiB=$(sizeMiB "$partitionPath") + table+=$'\n'"size=${sizeMiB}MiB,$(awk -f "$scriptsDir/sfdisk-field.awk" -v partition="$partition")" + gptBytes=$((gptBytes + sizeMiB * ONE_MiB)) done rm -f "$out" @@ -60,6 +59,7 @@ EOF n=0 for partition; do - fillPartition "$out" "$n" "$(partitionPath "$partition")" - n="$((n + 1))" + partitionPath=$(partitionPath "$partition") + fillPartition "$out" "$n" "$partitionPath" + n=$((n + 1)) done diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index d71c2325eff3bae921f33c61f799846d35e401c2..e403d697d90c0021a7a8d1dbc1553cfbda74a117 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -25,7 +25,7 @@ $(vmdir)/netvm/vmlinux: $(KERNEL) $(vmdir)/netvm/blk/root.img: ../../../scripts/make-gpt.sh ../../../scripts/sfdisk-field.awk build/rootfs.erofs mkdir -p $$(dirname $@) - ../../../scripts/make-gpt.sh $@.tmp \ + bash ../../../scripts/make-gpt.sh $@.tmp \ build/rootfs.erofs:root:ea21da27-0391-48da-9235-9d2ab2ca7844:root mv $@.tmp $@ -- 2.52.0