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 641DAB50C; Wed, 26 Nov 2025 19:37:14 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 9CA10B425; Wed, 26 Nov 2025 19:37:05 +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 84627B376 for ; Wed, 26 Nov 2025 19:36:59 +0000 (UTC) Received: by mail-yx1-xb131.google.com with SMTP id 956f58d0204a3-640d790d444so135337d50.0 for ; Wed, 26 Nov 2025 11:36:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764185817; x=1764790617; 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=cAXWVDvqrPzRFaEQKa17gebJcqpI/TyMjZYxsgfsBUI=; b=kUORW3rzYt9XbiQyxkKsZJJa3cRXGluVgrcoDooSk9nsiREvFvlezyTjUjjnhXvIAL BGF23bdTY0zeJW9A+7ZrTOmMk9L7/qoVx0cDMfLA8WF0lnvaXQnnjeEuN0UbhJ2LFUXH fkMfgJEWl1hOrrv1MdlK7M5eYGd5Jwlvym0hdsWi2s44g0aTU72UjvSj67O6wNUXKwTx wA01lD5WOxIXLRYhPOHRapeSh+u/OO9kKhgElc3h714Z0qdIxxPzn2op8cZm6q5L1PY5 M/MaQ2+CThUkB6qh3zPZoV+sD+DESbbVlszl3D3oTROsGqErxfSECvhQYNXygAbyQVce Hufw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764185817; x=1764790617; 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=cAXWVDvqrPzRFaEQKa17gebJcqpI/TyMjZYxsgfsBUI=; b=giH8IHFd3id6onvJ4ByUXLyPeldnZpf4rdMiWOJaQFNR3XDzaGgK0Zrj7ej+yTouHV BLeD2fmWKMDhnQO2Wn1Z/CO6eawIzKSrH14corIAI7ekJX9qVoDKzskIEzj7K4JdVN3D reyxuV0KID4dhad4CAg9Bnsm7UWonAFdGK9WiHswLmMHli8ks+GqGQZOlzLPFCIMJb4G 5Etlf+P1Z8Z2/KyBTeLqtaRUbkNE9jawqwjANop0VuhWtoDwRuo/0nbi/ZHTlagbkA3o fFx0jNCD3aF3t+nWWh8jnoVZ4wVjKlpHhuMYybZAm8Pgb+bVckaKXB5wdGgaaoQahFtD Dldw== X-Gm-Message-State: AOJu0Yyj5Dot3rRyH7LAYW3m2Vw4ZZyDNmuQlSlwKt8wkPdVPJsPm64G oENVgeoIlf7DzfzcfThIQ7YsWM3oOeDm3rotLHX34VjrDJGE3AXqQIBgvrMblg== X-Gm-Gg: ASbGncvC/F6f3HxUtiBaZrZB4GXBIV3RAmsj+FV2lBDSZdWWqzqqm/2PfW2FdL1DTrW v3hWfbxQCSKn0WoWtEIAa+pDxHxZ+MF/ES7khXdhLDgnSD1zMr7M+ScTd9JDMfvx2d+8eeTLp4e 2ZlmxSUuC/rf+A5keT0nmg+VpNOHQrpaMHhMNnBFLpjNiGkq1EI7NwXzD/1p7mKdRgPxeoPcOkO oM+W6+ACBLlRVIBHiZUFfuNVXVFN9h8jmP5U/DtrvL/jYRhB1Rx7MTE6XEbR4B/64YIEHQoZ4xG A1xK7lMuVtiZyeVLzKgIyEP9YBwOIQbkRS/seCeVgscVXfa6SJYtf9UwauJsFh6Kr4iSvgB3Wbb UY5eEU25A0hzaUEFF+h8Cew7c3i8WbTMt+W2jTto67WMs7IYZbZh1e+3dbv7mJPZzmYzwEHA8oI dW1yu/GnEe9ch+L1GZbplIgITzgxVlFKa8PfeM4vGRclwGyDcdQbZXvJDEA/B1DrAnsNj5DAd+b +1sPOy2V3zIrNknF0uebcoX7iSJ0pwicTY= X-Google-Smtp-Source: AGHT+IEZroD9U1lRCmYoZnCusxUuU3Wr/3a7mfGFx1En+/FEDyvHP58Nrow/DZs/6I6rYk+X1FmTpg== X-Received: by 2002:a53:d048:0:20b0:63f:beb2:950f with SMTP id 956f58d0204a3-64302a5d4c6mr12256200d50.34.1764185817020; Wed, 26 Nov 2025 11:36: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 956f58d0204a3-642f71ae739sm7604654d50.25.2025.11.26.11.36.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 11:36:56 -0800 (PST) From: Demi Marie Obenour Date: Wed, 26 Nov 2025 14:34:03 -0500 Subject: [PATCH v4 05/13] Use set and a command substitution to set UUID variables MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251126-updates-v4-5-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=4203; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=KRRtQAZ/cHSh6nU8atF4DNHehtFa+jAD3xtAdwUFkcw=; b=VgnmJWFIURwlNhUYTy8Rq4vekEKHnLtt+Bb+MnW8/z+GzflAhRuN6SD1pkCeVezSieeR/avIW Fu736YjC8NDB0MOUNgdVAiDaUMlTYWl+GUK8XHXOMVekqJaiVb+1oMn X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: JNMHVGNAQCENHY5IVIVY6QB4MVYA5EAR X-Message-ID-Hash: JNMHVGNAQCENHY5IVIVY6QB4MVYA5EAR 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: No functional change intended. Signed-off-by: Demi Marie Obenour --- host/initramfs/Makefile | 6 ++++-- host/rootfs/Makefile | 6 ++++-- release/live/Makefile | 6 ++++-- scripts/format-uuid.awk | 20 +++++++++++++++----- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/host/initramfs/Makefile b/host/initramfs/Makefile index e04e2ff471750410926f14099cee9786d582de86..392dcfc8af3d6924fae717025124f228a2362b94 100644 --- a/host/initramfs/Makefile +++ b/host/initramfs/Makefile @@ -36,9 +36,11 @@ build/mountpoints: find build/mountpoints -mindepth 1 -exec touch -d @0 {} ';' build/live.img: ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk $(ROOT_FS_IMAGES) + uuids=$$(awk -f ../../scripts/format-uuid.awk < $(ROOT_FS_VERITY_ROOTHASH)) && \ + set -u -- $$uuids && \ bash ../../scripts/make-gpt.sh $@.tmp \ - $(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))") + $(ROOT_FS_VERITY):verity:$$2 \ + $(ROOT_FS_IMAGE):root:$$1 mv $@.tmp $@ build/loop.tar: build/live.img diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index b2c0c6176fe0de4a99d1a3737d50054b532af598..ab24263c6f327e47cd1d012ca8d729b0ea5eb8f3 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -93,9 +93,11 @@ clean: .PHONY: clean build/live.img: ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/verity-timestamp $(ROOT_FS_IMAGES) + uuids=$$(awk -f ../../scripts/format-uuid.awk < $(ROOT_FS_VERITY_ROOTHASH)) && \ + set -u -- $$uuids && \ bash ../../scripts/make-gpt.sh $@.tmp \ - $(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))") + $(ROOT_FS_VERITY):verity:$$2 \ + $(ROOT_FS_IMAGE):root:$$1 mv $@.tmp $@ debug: diff --git a/release/live/Makefile b/release/live/Makefile index 48df3ef4ad3faab4e0ad09380bd70dbdc980109f..5ab93451de109949af0e7ed7f70bf6827fefbf69 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -10,10 +10,12 @@ DTBS ?= build/empty dest = build/live.img $(dest): ../../scripts/format-uuid.awk ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) + uuids=$$(awk -f ../../scripts/format-uuid.awk < $(ROOT_FS_VERITY_ROOTHASH)) && \ + set -u -- $$uuids && \ bash ../../scripts/make-gpt.sh $@.tmp \ build/boot.fat:c12a7328-f81f-11d2-ba4b-00a0c93ec93b \ - $(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))") + $(ROOT_FS_VERITY):verity:$$2 \ + $(ROOT_FS_IMAGE):root:$$1 mv $@.tmp $@ build/empty: diff --git a/scripts/format-uuid.awk b/scripts/format-uuid.awk index 17831221bbef2d2d038f4822b22f88939eab7437..d4c1a75d97ed86e17a118d8b2d3252cd78c77286 100644 --- a/scripts/format-uuid.awk +++ b/scripts/format-uuid.awk @@ -1,9 +1,19 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2025 Demi Marie Obenour +function format_uuid(arg) { + print (substr(arg, 1, 8) "-" \ + substr(arg, 9, 4) "-" \ + substr(arg, 13, 4) "-" \ + substr(arg, 17, 4) "-" \ + substr(arg, 21, 12)); +} + 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)); + FS = ""; + if (getline != 1) { + print "Empty input file" > "/dev/stderr"; + exit 1; + } + format_uuid(substr($0, 1, 32)); + format_uuid(substr($0, 33, 32)); } -- 2.52.0