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 6BFC627F5; Thu, 20 Nov 2025 10:28:26 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 40998281B; Thu, 20 Nov 2025 10:28:24 +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-x1134.google.com (mail-yw1-x1134.google.com [IPv6:2607:f8b0:4864:20::1134]) by atuin.qyliss.net (Postfix) with ESMTPS id 84D4E2817 for ; Thu, 20 Nov 2025 10:28:22 +0000 (UTC) Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-789314f0920so6664337b3.1 for ; Thu, 20 Nov 2025 02:28:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763634499; x=1764239299; darn=spectrum-os.org; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:from:to:cc:subject :date:message-id:reply-to; bh=azX4iSBu1neoGYtTJwtcJgghax1ak8VMCz4Xt+1f9LQ=; b=deKjbdTnMh59G4MMtlUA7QlUiGxGrUzZbtsGg4jg4teWZonOlazSXRi+9MNOrINZSf +ZeWrAkLSF9u/caoSIPQFzpyQgOm3nkoUp2zWrmg5cRkD/tFbmw5UxLGKZ1vcXuBMveP Y4ZZosYNbfgVjyLVlUvVrXmUsuyB6WsOB+L3v41oxc0OJEcRc8qDzenpHfGaCg5qZvrg J6ftO9ypmyTe/ajT2WJF5/7wUzG8RkjaCBRFiAUig7MpGQfhoEEXu3Xo/BsTDa7H9RuN +dgKZnneRIFXuGktJRQfuwvrIfsjp40+bNbujpSdJdE7o6BKnmM8kH/21o25g5QhOwwZ Xjqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763634499; x=1764239299; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=azX4iSBu1neoGYtTJwtcJgghax1ak8VMCz4Xt+1f9LQ=; b=vITiUWkU2zZF1kvYTekTZk58ZnuVxlulRy9sgB1PKUuVklROXSFNrxMeMToOUeE47n 3mLH13/QFlkvA1qFFSVeC1OLW2Jn27fsA/AR18goFAd+VVFmOMMRpufqD2Ij6EPdE8Xz I5Y1ToI9ZD2jErhaTXPB0+AcEPUNxjRcZc5359wyS5V/AxrFRQci/veIMMkGGYpbIFzA X+FZE3sE6thjylXSt1K7VLOe6qyYfrKjxL8ZO/UG0ShYZD4iUDl2jjlNCuhTuX3oDIXB zP451+KcIUexVsonB7LKGAxbeP/WQafvnVfq8+73oaxGuMqV1T00L6pkmivked5X2n3m MBOw== X-Gm-Message-State: AOJu0Ywzf/7rjVQuU7n6fCeCnwGG4DaASpdCA2SvRTA81EbdEEAGNK/Y hlljnZ7QvKKhDgOJRmrY6VhlYRqL40xDJq9xPE+nyQS9rb9+9VJnrTSlB01hGwDP X-Gm-Gg: ASbGnctdcqjcsPk9irAIJDcrQyMJ2Q2WlqAn5W/x7ERTdn0E2Y5IK0jhU1OFHHPh9sq hX3NSTnNOyDACob9FU43qhsB6WS3mqWLLQTzi09pnDw7cDDzqrx0gcXZSui31Caxf80ongKDtqq nJh1JE9AEgWnLzJ4GdY0P6xntIRnurpzL87KoL3sunqWSAoCAxkGxlwtJxYQuUIm076LgY6IcHi ZisSFEJur/Z+teC1Mo1hZibYtnRyFLmOsCrHHwdqiDzNZ+uqZlPRG7/QmKak4mxQR4iFd6GkdPE VAhxf7Ouf8Gx83VruC7iy3FIEwOoLAS7Pe1FMrecZvDd2nuoah1wOWjclMuzRbwEIO+UbGV0gv9 WU1m8YAPqMwTguJP6lA5o9rTRXZdqxX+XPQ76EBqqVKboywZak7S8hs+Q8+HgPAr1GSQfCGbOE9 j2bkAP8CQ79kfKPBKJenT3yyVtDD5ie8Vonwyo26fkDnPmVMA5I/DOGPuATmnclc1gAqlPLjZEB Ul0ZpH1quu5r0Pz6nXUnemSsYU= X-Google-Smtp-Source: AGHT+IFkenfl4zS4H6qo6avsMWZBy4tv2UW2R/eYQU/7x2SzaktiiUDr1uoxMkuTuwUUFvcN7t6wPw== X-Received: by 2002:a05:690c:6c91:b0:788:1a92:4fd9 with SMTP id 00721157ae682-78a7960d819mr23251717b3.33.1763634498395; Thu, 20 Nov 2025 02:28:18 -0800 (PST) Received: from [10.138.34.110] (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with ESMTPSA id 00721157ae682-78a79925943sm6120027b3.28.2025.11.20.02.28.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Nov 2025 02:28:17 -0800 (PST) Message-ID: <56c09d74-c99c-4b43-9878-16efc91cea4f@gmail.com> Date: Thu, 20 Nov 2025 05:28:12 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 04/14] scripts: port make-gpt.sh to bash To: Spectrum OS Development References: <20251119-updates-v3-0-b88a99915509@gmail.com> <20251119-updates-v3-4-b88a99915509@gmail.com> Content-Language: en-US From: Demi Marie Obenour Autocrypt: addr=demiobenour@gmail.com; keydata= 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 +MYSfkEjBz0E8CLOcAw7JIwAaeBT In-Reply-To: <20251119-updates-v3-4-b88a99915509@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Po0Gv58XLVFr62wHNfo6q5l1" Message-ID-Hash: CZ24JTD7RQRYYIY7CX6OU6BINNRT5VWZ X-Message-ID-Hash: CZ24JTD7RQRYYIY7CX6OU6BINNRT5VWZ 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: 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 is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Po0Gv58XLVFr62wHNfo6q5l1 Content-Type: multipart/mixed; boundary="------------c9eXAitRq2YCm0nGmA08oAZ8"; protected-headers="v1" From: Demi Marie Obenour To: Spectrum OS Development Cc: Alyssa Ross Message-ID: <56c09d74-c99c-4b43-9878-16efc91cea4f@gmail.com> Subject: Re: [PATCH v3 04/14] scripts: port make-gpt.sh to bash References: <20251119-updates-v3-0-b88a99915509@gmail.com> <20251119-updates-v3-4-b88a99915509@gmail.com> In-Reply-To: <20251119-updates-v3-4-b88a99915509@gmail.com> Autocrypt-Gossip: addr=hi@alyssa.is; keydata= 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 wGxvGU7TX5ou --------------c9eXAitRq2YCm0nGmA08oAZ8 Content-Type: multipart/mixed; boundary="------------SqPPp67fjYyAfWWchYuXTsiL" --------------SqPPp67fjYyAfWWchYuXTsiL Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 11/19/25 03:18, Demi Marie Obenour wrote: > Also add some error checks and use Bash features. >=20 > No other functional change intended. >=20 > Signed-off-by: Demi Marie Obenour > --- > Changes since v2: >=20 > - 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 | 4 ++-- > scripts/make-gpt.sh | 20 ++++++++++---------- > vm/sys/net/Makefile | 2 +- > 6 files changed, 17 insertions(+), 17 deletions(-) >=20 > diff --git a/host/initramfs/Makefile b/host/initramfs/Makefile > index 13bb548d6146684a25dab1e31228c0b9a4ca8db7..fd8cbb6c3e775ed27d0a524= bf167cb4d3940d799 100644 > --- a/host/initramfs/Makefile > +++ b/host/initramfs/Makefile > @@ -36,7 +36,7 @@ build/mountpoints: > find build/mountpoints -mindepth 1 -exec touch -d @0 {} ';' > =20 > 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=3D= $(ROOT_FS_VERITY_ROOTHASH) bs=3D32 skip=3D1 count=3D1 status=3Dnone)") \ > $(ROOT_FS):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 > =20 > build/loop.img: ../../scripts/make-gpt.sh ../../scripts/sfdisk-field.a= wk build/loop.ext4 > - ../../scripts/make-gpt.sh $@.tmp \ > + bash ../../scripts/make-gpt.sh $@.tmp \ > build/loop.ext4:56a3bbc3-aefa-43d9-a64d-7b3fd59bbc4e > mv $@.tmp $@ > =20 > diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile > index 4c14d3acfa8f7ffd276fdfb684d08bf58fd80a15..533471c58591d305f386157= e04e9e48da7259fd5 100644 > --- a/host/rootfs/Makefile > +++ b/host/rootfs/Makefile > @@ -96,7 +96,7 @@ clean: > .PHONY: clean > =20 > build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh= ../../scripts/sfdisk-field.awk $(ROOT_FS_DIR)/verity-timestamp $(ROOT_FS= ) > - ../../scripts/make-gpt.sh $@.tmp \ > + bash ../../scripts/make-gpt.sh $@.tmp \ > $(ROOT_FS)/rootfs.verity.superblock:verity:$$(../../scripts/forma= t-uuid.sh "$$(dd if=3D$(ROOT_FS_VERITY_ROOTHASH) bs=3D32 skip=3D1 count=3D= 1 status=3Dnone)") \ > $(ROOT_FS)/rootfs: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..f16c2df1b90bbec6750f298= 0da4dbaf49c9cb0ea 100644 > --- a/img/app/Makefile > +++ b/img/app/Makefile > @@ -26,7 +26,7 @@ $(imgdir)/appvm/vmlinux: $(KERNEL) > =20 > $(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 $@ > =20 > diff --git a/release/live/Makefile b/release/live/Makefile > index d61248e94599adc5229d0ad38d54b9f649d66ca1..4dbac28a90dc6f64a253961= c33c597220d0e85cf 100644 > --- a/release/live/Makefile > +++ b/release/live/Makefile > @@ -9,8 +9,8 @@ DTBS ?=3D build/empty > =20 > dest =3D build/live.img > =20 > -$(dest): ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../= scripts/sfdisk-field.awk build/boot.fat $(ROOT_FS_IMAGES) > - ../../scripts/make-gpt.sh $@.tmp \ > +$(dest): ../../scripts/format-uuid.sh ../../scripts/make-gpt.bash ../.= =2E/scripts/make-gpt.sh ../../scripts/sfdisk-field.awk build/boot.fat $(R= OOT_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 i= f=3D$(ROOT_FS_VERITY_ROOTHASH) bs=3D32 skip=3D1 count=3D1 status=3Dnone)"= ) \ > $(ROOT_FS):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 $(= ROOT_FS_VERITY_ROOTHASH))") The new dependency on ../../make-gpt.bash is wrong and causes a build failure. The dependency is removed in patch 6/14 ("Support generating multiple partition UUIDs"), which is why it wasn't caught by testing. I now have access to a powerful server that can build release.nix in a reasonable amount of time, which will allow me to do it on every commit instead of just on selected commits. In fact, this is how I found the problem. --=20 Sincerely, Demi Marie Obenour (she/her/hers) --------------SqPPp67fjYyAfWWchYuXTsiL Content-Type: application/pgp-keys; name="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Disposition: attachment; filename="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsFNBFp+A0oBEADffj6anl9/BHhUSxGTICeVl2tob7hPDdhHNgPR4C8xlYt5q49y B+l2nipdaq+4Gk6FZfqC825TKl7eRpUjMriwle4r3R0ydSIGcy4M6eb0IcxmuPYf bWpr/si88QKgyGSVZ7GeNW1UnzTdhYHuFlk8dBSmB1fzhEYEk0RcJqg4AKoq6/3/ UorR+FaSuVwT7rqzGrTlscnTDlPWgRzrQ3jssesI7sZLm82E3pJSgaUoCdCOlL7M MPCJwI8JpPlBedRpe9tfVyfu3euTPLPxwcV3L/cfWPGSL4PofBtB8NUU6QwYiQ9H zx4xOyn67zW73/G0Q2vPPRst8LBDqlxLjbtx/WLR6h3nBc3eyuZ+q62HS1pJ5EvU T1vjyJ1ySrqtUXWQ4XlZyoEFUfpJxJoN0A9HCxmHGVckzTRl5FMWo8TCniHynNXs BtDQbabt7aNEOaAJdE7to0AH3T/Bvwzcp0ZJtBk0EM6YeMLtotUut7h2Bkg1b//r 6bTBswMBXVJ5H44Qf0+eKeUg7whSC9qpYOzzrm7+0r9F5u3qF8ZTx55TJc2g656C 9a1P1MYVysLvkLvS4H+crmxA/i08Tc1h+x9RRvqba4lSzZ6/Tmt60DPM5Sc4R0nS m9BBff0Nm0bSNRS8InXdO1Aq3362QKX2NOwcL5YaStwODNyZUqF7izjK4QARAQAB zTxEZW1pIE9iZW5vdXIgKElUTCBFbWFpbCBLZXkpIDxhdGhlbmFAaW52aXNpYmxl dGhpbmdzbGFiLmNvbT7CwY4EEwEIADgWIQR2h02fEza6IlkHHHGyiLVf/5wiwQUC X6YJvQIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCyiLVf/5wiwWRhD/0Y R+YYC5Kduv/2LBgQJIygMsFiRHbR4+tWXuTFqgrxxFSlMktZ6gQrQCWe38WnOXkB oY6n/5lSJdfnuGd2UagZ/9dkaGMUkqt+5WshLFly4BnP7pSsWReKgMP7etRTwn3S zk1OwFx2lzY1EnnconPLfPBc6rWG2moA6l0WX+3WNR1B1ndqpl2hPSjT2jUCBWDV rGOUSX7r5f1WgtBeNYnEXPBCUUM51pFGESmfHIXQrqFDA7nBNiIVFDJTmQzuEqIy Jl67pKNgooij5mKzRhFKHfjLRAH4mmWZlB9UjDStAfFBAoDFHwd1HL5VQCNQdqEc /9lZDApqWuCPadZN+pGouqLysesIYsNxUhJ7dtWOWHl0vs7/3qkWmWun/2uOJMQh ra2u8nA9g91FbOobWqjrDd6x3ZJoGQf4zLqjmn/P514gb697788e573WN/MpQ5XI Fl7aM2d6/GJiq6LC9T2gSUW4rbPBiqOCeiUx7Kd/sVm41p9TOA7fEG4bYddCfDsN xaQJH6VRK3NOuBUGeL+iQEVF5Xs6Yp+U+jwvv2M5Lel3EqAYo5xXTx4ls0xaxDCu fudcAh8CMMqx3fguSb7Mi31WlnZpk0fDuWQVNKyDP7lYpwc4nCCGNKCj622ZSocH AcQmX28L8pJdLYacv9pU3jPy4fHcQYvmTavTqowGnM08RGVtaSBNYXJpZSBPYmVu b3VyIChsb3ZlciBvZiBjb2RpbmcpIDxkZW1pb2Jlbm91ckBnbWFpbC5jb20+wsF4 BBMBAgAiBQJafgNKAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCyiLVf /5wiwYa/EACv8a2+MMou9cSCNoZBQaU+fTmyzft9hUE+0d5W2UY1RY3OsjFIzm9R /4SVccfsqOYLEo+S0vQMIIIqFEq3FCpXXwPzyimotps05VA8U3Bd7yseojFygOgK sAMOAee2RCaDDOnoJue01dfZMzzHPO/TVdp3OvnpWipfv5G1Xg96rwbhMLE3tg6N xwAHa31Bv4/Xq8CJOoIWvx6fcmZQpz01/lSvsYn0KrfEbTKkuUf0vM9JrCTCP2oz VNN5BYzqaq2M4r+jmSyeXLim922VOWqGkUEQ85BSEemqrRS06IU6NtEMsF8EWt/b hWjk/9GDKTcnpdJHTrMxTspExBiNrvpI2t+YPU5B/dJJAUxvmhFrbSIbdB8umBZs I3AMYrEmpAbh5x7jEjoskUC7uN3o9vpg1oCLS2ePDLtAtyBtbHnkA4xGD7ar8mem xpH9lY/i+sC6CyyIUWcUDnnagKyJP0m9ks0GLsTeOCA0bft2XA6rD6aaCnMUsndT ctrab42CV5XypjmC4U1rPJ8JQJUh1/3P48/8sMH+3krxpJ06KNWNFaUbaMTGiltZ 7x9DngklSYrX0T+2G4kVXNmjaljwkoLahwLla2gUWwBSyofXdqyhQdwZsp01KXNQ UCyT/Pg+aDcm/E7OMV3d4lf7g/CSxiX2GSEe6BlhSz+Lmd7ZJ3g32M1ARGVtaSBN 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 EtJuZYM5blWncBOJCoWMnBEcTEo/viU3GgcVRw=3D=3D =3Dx94R -----END PGP PUBLIC KEY BLOCK----- --------------SqPPp67fjYyAfWWchYuXTsiL-- --------------c9eXAitRq2YCm0nGmA08oAZ8-- --------------Po0Gv58XLVFr62wHNfo6q5l1 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEopQtqVJW1aeuo9/sszaHOrMp8lMFAmke7T0ACgkQszaHOrMp 8lMXHRAAooDIV3DAx4DRiX/mJFNUamsgNMXzmm0oBlpBmDuTV6cfRXjWLAW/8mCr BAXWtvAi3zVRKo48pQGMyEsRmG1iPRt27OBFnvXo9u3DYn4lT1HC9Spi9nJKAUsV n8cmkJQ80sBvLp7+YaiPr5bdGyHWG5sj/8TdADQtIkS8XpCddmrFsB4OcDPBfoxp S0DN2BA4UT+1OJuEFE4kjQJfrWT1hlT3gaGZu07cKkhLABfWReSrNwSwmMZfpFQB xbYHp1QKRsiF7TCCBOaPjvN1mFb7bTeIDnp1CfLITf1YWlC/FdDwPX1yEzrn1BG9 CqlsU2CL3Y2RG/6Grt8RLem6qH7ZjavUu/FU1nZVKc5ECv0xwATTzl9/1SYMcJlr J81kGGRPTghUsbD96dtZt8gekUAOgCGh2pyk6ajI5ChvSO7UNKsquYMWnlQ9/OVs YL2N+faqB9RuJ4IuLhX92lgvPemBPj4ky1dLu0PySTFP36n+PCZM+I04YeIQnjfr o4xZAuOTxJ/UnCRMD1HKCpjGyGd3hloHCb+xeYhxlY5uG3aBr4pRXpmotjaSMKYf tkp7fzpBOEfsx7BBHwNgcyqc+jYqAqIacAwx0yXZ5MUhFLC2sV4dlCUEQN9uTW75 09WnWGdllHyEtSldwsW//Mx72TWLRK8X8RrAJ42jD8RXABRzLas= =gPSt -----END PGP SIGNATURE----- --------------Po0Gv58XLVFr62wHNfo6q5l1--