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 6455EB868; Wed, 26 Nov 2025 19:42:05 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id D2970B81F; Wed, 26 Nov 2025 19:41:53 +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-x112e.google.com (mail-yw1-x112e.google.com [IPv6:2607:f8b0:4864:20::112e]) by atuin.qyliss.net (Postfix) with ESMTPS id 1F9F8B759 for ; Wed, 26 Nov 2025 19:41:48 +0000 (UTC) Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-787d5555274so1611527b3.1 for ; Wed, 26 Nov 2025 11:41:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764186106; x=1764790906; 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=pJsSw7n0xiNLWfBK7oz+gsDAlS7C9JH7fug0e9flJ0A=; b=RwFvPjS0QlOn8+RvH15MwnzvhuZF7yqJT8Im0BP4m29nZLMwPJd/qrV/qnvWunZAeV aqxhlRHN4zPtKRELRVyve4anI6tMW+XQCLw9hG4NQs7PBbCHIQWqICfdbsEehMV2syL9 t2Zi+JUVdqgEAQOAlmALbXKU/KmtP+hgujrDJBhdfQqyqsvHN2GVys45tLUIwf5QcCz2 8ePPGSv9a9AgZumsf38QBe6VQXpUr8+vAEIq5UEHE3rYUrop5fsV2KS4nZQYk0lUkyCo /OmDUdaPgPu39PvsxHPPYMtTisosc9ZkMB6r4vUGmNOSiOBWgLQVcvdqIN5TXjVMzmF0 FRRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764186106; x=1764790906; 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=pJsSw7n0xiNLWfBK7oz+gsDAlS7C9JH7fug0e9flJ0A=; b=HFbR00BA4riSrj1pHY/pbq+tnl1uHApvA1iSlxyNLFheyJ7PRTsYTRtCXfsQs9Xw6U 7BzEnzugDq7yFqq7qCJcjBnq6UMJHdptRM9hvvbdCGLn+7rifyXJa+w/2ydBYqOMvUeE 5y9AzMOnnAhi/QxmxH6mRinWfztZOoX09o1xDlqpnaaEU7TzAFrsuOpbFcZTZezNmoeT KeLzr2mxoQKJfMKvfTeynUXYbmGxTspcQyn/G9jKfc8ztlYS7mG4xa1XE+8ilNKvFaUM i7PzQ04RISloUaYYNFTXmTkQy9bZSkqv+8IhKgKwgJNpeBiBmNjMqHeL4x24kyxWYXRE a9tg== X-Gm-Message-State: AOJu0YxTenZT+k7e3eX9VBTj3u9hVNJUIZMU406FyVRSK+e2SPwSURXd GxIxJrmVaId2JK4xLusOWGgZA6LOIlrC8AT6jup6+zDUlOjR4smoYNnw7HYkzA== X-Gm-Gg: ASbGncux8CYpgEWc1M8AcvsnNtLbgPZrvhhQLEIwf90ARXh5raf6FHYhLE0whu4Be/1 c3tErMEzge6CIwMq/NVRYHzk1GZi7iEbTJXtyHLKcVqe8/Qe879jD/DPMiJwOyFkxc/pfLNeHOE JfW6/PY0763SOTkv95kPBgsFtdCyuc56iknOzYO6sXNM+h6TIlCA6cCKv7ZMsZekziKa3fM6NT1 KHIH5K0AXm9gTqwIOxrMoYAquw5o4tYSCUmnF4Yv3sZT5tBVp8JL+DFPbAU8uXjjMJH6an05YCz oOZHicMEv+7i2DgZSv985gw6X6ZnTr8bkS/eSdtWf2zkn68wUunU3PoPiPV0G4fgXGoFptEeE62 TdSYeklMk6oAyoFpqyjwNk1WbkrP+M7+KLW37p1IXMl9OmZeHUpxWB6wpch/UWudyZ6DHN0tk2S HLlDt1XKgUWmy7Qxaw6q0dY0eI8G+JflQXkxPKVEQpGDmrQ0sINYMYo8noNxRlCycFvdYMS1vpC G2D6iJq94nK6dKIRFlDmbgkQxMVEniJig0= X-Google-Smtp-Source: AGHT+IHVBRB3J+N+sHe8V5CQRnX733FeBerpnH6/YdjXuPWzmUD3qSQU1yu7jUY+ypUTJocvR9N51A== X-Received: by 2002:a05:690c:6004:b0:786:5ebb:483f with SMTP id 00721157ae682-78ab6fce6ffmr78594357b3.65.1764186105784; Wed, 26 Nov 2025 11:41:45 -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-78a7987f4e0sm70358937b3.4.2025.11.26.11.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 11:41:45 -0800 (PST) From: Demi Marie Obenour Date: Wed, 26 Nov 2025 14:40:44 -0500 Subject: [PATCH v5 04/13] Port scripts/format-uuid.sh to awk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251126-updates-v5-4-fd746748febd@gmail.com> References: <20251126-updates-v5-0-fd746748febd@gmail.com> In-Reply-To: <20251126-updates-v5-0-fd746748febd@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764186040; l=5911; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=oInNDJy9goY8YUY5QzLGRBWmr2iaV4KtTWsx3IuGT+A=; b=TwR3iBFmPgLXcM2CywvEGn7Ac/p/5e3/DcWKWTWHmJsJsJck1iZySlIZLhAPkR/l1lKESS4QU nZ4VO2k/ufzC5hs/1EIGMRWgBsQgtUHRSZG9cRbc0m/JFkCxwj7+xVd X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: XCZWBKNZUNL5V3LHRT3HCNCQWEMDR35P X-Message-ID-Hash: XCZWBKNZUNL5V3LHRT3HCNCQWEMDR35P 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 makes it significantly easier to extend. Future changes will require it to be able to output multiple UUIDs at once. Signed-off-by: Demi Marie Obenour --- Changes since v4: - Convert script from sh to awk before making any functional changes. --- host/initramfs/Makefile | 6 +++--- host/rootfs/Makefile | 6 +++--- release/live/Makefile | 6 +++--- release/live/default.nix | 2 +- scripts/format-uuid.awk | 9 +++++++++ scripts/format-uuid.sh | 19 ------------------- 6 files changed, 19 insertions(+), 29 deletions(-) diff --git a/host/initramfs/Makefile b/host/initramfs/Makefile index 2304b0885a152d8a659dddcc58f948d096034e2d..e04e2ff471750410926f14099cee9786d582de86 100644 --- a/host/initramfs/Makefile +++ b/host/initramfs/Makefile @@ -35,10 +35,10 @@ build/mountpoints: cd build/mountpoints && mkdir -p $(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) +build/live.img: ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk $(ROOT_FS_IMAGES) 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))") + $(ROOT_FS_VERITY):verity:$$(awk -f ../../scripts/format-uuid.awk "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ + $(ROOT_FS_IMAGE):root:$$(awk -f ../../scripts/format-uuid.awk "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))") mv $@.tmp $@ build/loop.tar: build/live.img diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index f45758041f2f682618cb0f9e54e5a74f0b49874e..b2c0c6176fe0de4a99d1a3737d50054b532af598 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -92,10 +92,10 @@ clean: rm -rf build .PHONY: clean -build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/verity-timestamp $(ROOT_FS_IMAGES) +build/live.img: ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/verity-timestamp $(ROOT_FS_IMAGES) 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))") + $(ROOT_FS_VERITY):verity:$$(awk -f ../../scripts/format-uuid.awk "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ + $(ROOT_FS_IMAGE):root:$$(awk -f ../../scripts/format-uuid.awk "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))") mv $@.tmp $@ debug: diff --git a/release/live/Makefile b/release/live/Makefile index c712db3727b7008105388a278552fd3d81eb3b4c..48df3ef4ad3faab4e0ad09380bd70dbdc980109f 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -9,11 +9,11 @@ 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) +$(dest): ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) 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))") + $(ROOT_FS_VERITY):verity:$$(awk -f ../../scripts/format-uuid.awk "$$(dd if=$(ROOT_FS_VERITY_ROOTHASH) bs=32 skip=1 count=1 status=none)") \ + $(ROOT_FS_IMAGE):root:$$(awk -f ../../scripts/format-uuid.awk "$$(head -c 32 $(ROOT_FS_VERITY_ROOTHASH))") mv $@.tmp $@ build/empty: diff --git a/release/live/default.nix b/release/live/default.nix index ba9bb17e697a6ecfe81e52a4ffbc375ef443b6f3..d1e2422e9f1ba666af7ad7a5cce1c80a242d0777 100644 --- a/release/live/default.nix +++ b/release/live/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { fileset = lib.fileset.intersection src (lib.fileset.unions [ ./. ../../lib/common.mk - ../../scripts/format-uuid.sh + ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk ]); diff --git a/scripts/format-uuid.awk b/scripts/format-uuid.awk new file mode 100644 index 0000000000000000000000000000000000000000..17831221bbef2d2d038f4822b22f88939eab7437 --- /dev/null +++ b/scripts/format-uuid.awk @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: EUPL-1.2+ +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour +BEGIN { + print (substr(ARGV[1], 1, 8) "-" \ + substr(ARGV[1], 9, 4) "-" \ + substr(ARGV[1], 13, 4) "-" \ + substr(ARGV[1], 17, 4) "-" \ + substr(ARGV[1], 21, 12)); +} diff --git a/scripts/format-uuid.sh b/scripts/format-uuid.sh deleted file mode 100755 index 3b38278aef640b2cd540d6606b05dd62018e48a6..0000000000000000000000000000000000000000 --- a/scripts/format-uuid.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -eu -# -# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross -# SPDX-FileCopyrightText: 2022 Unikie -# SPDX-License-Identifier: EUPL-1.2+ - -substr() { - str=$1 - beg=$2 - end=$3 - echo "$str" | cut -c "$beg-$end" -} - -u1=$(substr "$1" 1 8) -u2=$(substr "$1" 9 12) -u3=$(substr "$1" 13 16) -u4=$(substr "$1" 17 20) -u5=$(substr "$1" 21 32) -printf "%s\n" "$u1-$u2-$u3-$u4-$u5" -- 2.52.0