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 85D45B1B3; Wed, 26 Nov 2025 19:11:41 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id F1D0BB129; Wed, 26 Nov 2025 19:11:37 +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-x1133.google.com (mail-yw1-x1133.google.com [IPv6:2607:f8b0:4864:20::1133]) by atuin.qyliss.net (Postfix) with ESMTPS id C55B9B11A for ; Wed, 26 Nov 2025 19:11:36 +0000 (UTC) Received: by mail-yw1-x1133.google.com with SMTP id 00721157ae682-7895017c722so1022477b3.2 for ; Wed, 26 Nov 2025 11:11:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764184295; x=1764789095; 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=9VKtzIoD9zsH4kXPBW7y/4CN97Ek2KCWvNO4CmcZ4+Q=; b=DdDAJvE4boANRg5HfIyQuVngGNJf7rT0kCLVC7EIKlKgAMlNVUhYedsTDq6y6/zE0R oA54AQ8ONrLsELXDNw4nmOVASsrw8lfGg/Fqce5DQGu+VSZuOXCT9TI7zZFnlCdRxBJP Hj95WPIE89n7Xr6CTkfXdENIBiPSBynC1t463+GItJC1IDxxAFPR8zZyUQRynOseKIuZ pJFatm7fuyqFhDapexa0cEMmHfV9vCsgzVVUqkBJgq8fNS0TMSzWO9yycO1O8W5tMDi/ E2M31Saa1FiUjWAfUWNvRm1AZKvfvW3Tpru0KFhHOEIy4wIP4WleQvJ4lF6od3moVTwS TaAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764184295; x=1764789095; 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=9VKtzIoD9zsH4kXPBW7y/4CN97Ek2KCWvNO4CmcZ4+Q=; b=bXI0Sg/ysKkORTRI5pVuJTObsGCMIxEKwu6q7nyDQf0962emgEJ4QgTPmrMvAATbLF OMpPaF+s8Isv6f/f5YQA7k3o1a5jyHwMbQIlR4njrgL7uN5SCtQ91IM1e0l35xkjWjqH khTWC+ya7VjsqApHbbOXocQfFQgbX//wIodAX0pEaXyej5ayPwBhHaipfbpkhzzGPxpc rl+X6BLs8mB7d74T0jVJFWHYICT49C5xnMNNd9kvH8lC4GE9h34VPE31voHfhE2sYbZq d6jWSBMtrvEzqaUQSi134RlBdhPU9SoCbv2p/M798vcqwflCA5jlXRodPdp1zOhYXnpH CyEA== X-Gm-Message-State: AOJu0Yx1dxwurxnCNdnTOrdFd6S29iksiuZA1A2mBESzAVt0UT0XmegI 6QJaJBXW0CnnsdHcTAS9Ro7zy3A8hSG3zeQ0Y4osvP9ZipN5dN87cbpT1o61KA== X-Gm-Gg: ASbGncuvnXvxnms7yQsguGu3CUu7uC44NI4I2F69AooIqqLLlDoYFDiio08fTTxFMSy iaM4YnsPlaqOdfQ3X5ppJBQGbna/2IRIBBW9OMqsnth7roqhEG+hcSuVG4vXXsgMtqtAE44MFne e8DKMvnRlz++xHLhGmDAj7L3SHvO23GytEViB8lOSolI0db6P9wrzUujy5t/WUyz1ZTNl3SMtcq CXyNsAb7vCNIxKZLQTzRjEwMGxVk9n+YKyb/fSVxQI1InVU56GRujxnZa5PkeZZYKibXtjavP/P nLfoyH1ZQQ+c6LVx7F5GN7mHDst6NZD7TudHWCg4Xq5d+zdQIjWX2tibiz/vt2GRW8A41wv+fkD IjvwH1rBYQ+k7U8QxnR6TxR9VLIySs2a47cNxg09QohSBN7PeEXt+choT/LK8WEeTe4yi7a3lV/ 1ROj72Gdbote5gtnJWp3n6/EP0dTd2qtb8GLltEh7+UaXJkEPdi8by7G8irG9Hyrxt+Dlkypz+g 6I0/wcEyvROT0bXfu2ILZ7zey7wGNAC16g= X-Google-Smtp-Source: AGHT+IGHHG9wx4Kq8HZTG9bx4UTN2cQrGETJExHBw7kf8e6FzKU+vn6yl98EL9UVW8hVGUmwkN7fKA== X-Received: by 2002:a05:690c:7087:b0:78a:82a1:42bd with SMTP id 00721157ae682-78ab6f34611mr75084537b3.38.1764184294451; Wed, 26 Nov 2025 11:11:34 -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-78a798804c4sm69928217b3.3.2025.11.26.11.11.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 11:11:33 -0800 (PST) From: Demi Marie Obenour Date: Wed, 26 Nov 2025 14:10:57 -0500 Subject: [PATCH v6 2/2] Move UKI creation to a separate derivation MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251126-refactor-verity-v6-2-f09555546a85@gmail.com> References: <20251126-refactor-verity-v6-0-f09555546a85@gmail.com> In-Reply-To: <20251126-refactor-verity-v6-0-f09555546a85@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1764184255; l=7193; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=wnNsCPjJmJI9Y+IZ1CWZJ8W+yTNFaM+j7VVLtbZmrL0=; b=g7JU96+SFhaGEE8gg4tDXm4Jp9JlclD4vF0EAiTfAVm+c5dXImTGiBaNtswJY5giy58VH1NRM mhg+cswxF+EBi/Eg7DQUlgWuKALjnISxVo5ayxdKRsUQV9SJmZllkxb X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: C2BTSG7GNK4RN3FU34RJF537BS43CMVX X-Message-ID-Hash: C2BTSG7GNK4RN3FU34RJF537BS43CMVX 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: It will be used by the update code later. No functional change intended, other than a trivial shell script refactoring. Signed-off-by: Demi Marie Obenour --- I kept release/live/default.nix using the UKI's systemd because the old code did it that way. Changing this would be better in a separate commit. Changes since v5: - Create a temporary symlink named build/spectrum.efi and then run $(MCOPY) -i $@ build/spectrum.efi ::/EFI/Linux, rather than copying the file with its original name. The latter results in an unbootable image. I do not know the reason. Signed-off-by: Demi Marie Obenour --- host/efi.nix | 40 ++++++++++++++++++++++++++++++++++++++++ release/live/Makefile | 17 ++++------------- release/live/default.nix | 27 +++++++++++---------------- release/live/shell.nix | 10 ++++++++-- 4 files changed, 63 insertions(+), 31 deletions(-) diff --git a/host/efi.nix b/host/efi.nix new file mode 100644 index 0000000000000000000000000000000000000000..ecedb6bea6bf29c7a7303dc9062fe12b5c7a9fbd --- /dev/null +++ b/host/efi.nix @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2021-2024 Alyssa Ross +# SPDX-FileCopyrightText: 2025 Demi Marie Obenour + +import ../lib/call-package.nix ( +{ callSpectrumPackage, cryptsetup, rootfs +, runCommand, stdenv, systemdUkify +}: +let + initramfs = callSpectrumPackage ./initramfs {}; + kernel = "${rootfs.kernel}/${stdenv.hostPlatform.linux-kernel.target}"; + systemd = systemdUkify.overrideAttrs ({ mesonFlags ? [], ... }: { + # The default limit is too low to build a generic aarch64 distro image: + # https://github.com/systemd/systemd/pull/37417 + mesonFlags = mesonFlags ++ [ "-Defi-stub-extra-sections=3000" ]; + }); +in + +runCommand "spectrum-efi" { + nativeBuildInputs = [ cryptsetup systemd ]; + __structuredAttrs = true; + unsafeDiscardReferences = { out = true; }; + dontFixup = true; + passthru = { inherit initramfs rootfs systemd; }; +} '' + read -r roothash < ${rootfs}/rootfs.verity.roothash + { \ + printf "[UKI]\nDeviceTreeAuto=" + if [ -d ${rootfs.kernel}/dtbs ]; then + find ${rootfs.kernel}/dtbs -name '*.dtb' -print0 | tr '\0' ' ' + fi + } | ukify build \ + --output "$out" \ + --config /dev/stdin \ + --linux ${kernel} \ + --initrd ${initramfs} \ + --os-release $'NAME="Spectrum"\n' \ + --cmdline "ro intel_iommu=on roothash=$roothash" + '' +) (_: {}) diff --git a/release/live/Makefile b/release/live/Makefile index ba81c7e679429e045b24c1591a9f0b72f016cfab..b37ccce42feb3ac7e8ce4faf96a67902b55be808 100644 --- a/release/live/Makefile +++ b/release/live/Makefile @@ -19,22 +19,13 @@ $(dest): ../../scripts/format-uuid.sh ../../scripts/make-gpt.sh ../../scripts/sf build/empty: mkdir -p $@ -build/spectrum.efi: $(DTBS) $(KERNEL) $(INITRAMFS) $(ROOT_FS_VERITY_ROOTHASH) - { \ - printf "[UKI]\nDeviceTreeAuto=" && \ - find $(DTBS) -name '*.dtb' -print0 | tr '\0' ' ' ;\ - } | $(UKIFY) build \ - --output $@ \ - --config /dev/stdin \ - --linux $(KERNEL) \ - --initrd $(INITRAMFS) \ - --os-release $$'NAME="Spectrum"\n' \ - --cmdline "ro intel_iommu=on roothash=$$(cat $(ROOT_FS_VERITY_ROOTHASH))" - -build/boot.fat: $(SYSTEMD_BOOT_EFI) build/spectrum.efi +build/boot.fat: $(SYSTEMD_BOOT_EFI) $(EFI_IMAGE) build/empty $(TRUNCATE) -s 440401920 $@ $(MKFS_FAT) $@ $(MMD) -i $@ ::/EFI ::/EFI/BOOT ::/EFI/Linux +# This symlink is necessary. Copying $(EFI_IMAGE) directly +# results in an unbootable image. TODO: figure out why. + ln -s $(EFI_IMAGE) build/spectrum.efi $(MCOPY) -i $@ build/spectrum.efi ::/EFI/Linux $(MCOPY) -i $@ $(SYSTEMD_BOOT_EFI) ::/EFI/BOOT/$(EFINAME) diff --git a/release/live/default.nix b/release/live/default.nix index 2a1dc3e1dd939f21edac582bf39737eb4d46eb0c..ba9bb17e697a6ecfe81e52a4ffbc375ef443b6f3 100644 --- a/release/live/default.nix +++ b/release/live/default.nix @@ -3,10 +3,9 @@ # SPDX-FileCopyrightText: 2022 Unikie import ../../lib/call-package.nix ( -{ callSpectrumPackage, spectrum-build-tools, rootfs, src +{ callSpectrumPackage, spectrum-build-tools, src , lib, pkgsStatic, stdenvNoCC , cryptsetup, dosfstools, jq, mtools, util-linux -, systemdUkify }: let @@ -14,14 +13,12 @@ let stdenv = stdenvNoCC; - systemd = systemdUkify.overrideAttrs ({ mesonFlags ? [], ... }: { - # The default limit is too low to build a generic aarch64 distro image: - # https://github.com/systemd/systemd/pull/37417 - mesonFlags = mesonFlags ++ [ "-Defi-stub-extra-sections=3000" ]; - }); - - initramfs = callSpectrumPackage ../../host/initramfs {}; efiArch = stdenv.hostPlatform.efiArch; + + efi = callSpectrumPackage ../../host/efi.nix {}; + + # The initramfs and rootfs must match those used to build the UKI. + inherit (efi) initramfs rootfs systemd; in stdenv.mkDerivation { @@ -40,17 +37,15 @@ stdenv.mkDerivation { sourceRoot = "source/release/live"; nativeBuildInputs = [ - cryptsetup dosfstools jq spectrum-build-tools mtools systemd util-linux + cryptsetup dosfstools jq spectrum-build-tools mtools util-linux ]; env = { - INITRAMFS = initramfs; - KERNEL = "${rootfs.kernel}/${stdenv.hostPlatform.linux-kernel.target}"; - ROOT_FS = rootfs; + KERNEL = "${efi.rootfs.kernel}/${stdenv.hostPlatform.linux-kernel.target}"; + ROOT_FS = "${efi.rootfs}"; SYSTEMD_BOOT_EFI = "${systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi"; + EFI_IMAGE = efi; EFINAME = "BOOT${toUpper efiArch}.EFI"; - } // lib.optionalAttrs stdenv.hostPlatform.linux-kernel.DTB or false { - DTBS = "${rootfs.kernel}/dtbs"; }; buildFlags = [ "dest=$(out)" ]; @@ -63,6 +58,6 @@ stdenv.mkDerivation { unsafeDiscardReferences = { out = true; }; dontFixup = true; - passthru = { inherit initramfs rootfs; }; + passthru = { inherit efi initramfs rootfs; }; } ) (_: {}) diff --git a/release/live/shell.nix b/release/live/shell.nix index 799d575b4f6e6f3dad8ac1a0a8bc2e3fc46aab44..b0bf957c085d1581a24d8916925611da0a60ec8b 100644 --- a/release/live/shell.nix +++ b/release/live/shell.nix @@ -1,7 +1,12 @@ # SPDX-License-Identifier: MIT # SPDX-FileCopyrightText: 2021-2024 Alyssa Ross -import ../../lib/call-package.nix ({ callSpectrumPackage, stdenv, qemu_kvm, rootfs }: +import ../../lib/call-package.nix ( +{ callSpectrumPackage, stdenv, qemu_kvm }: + +let + efi = callSpectrumPackage ../../host/efi.nix {}; +in (callSpectrumPackage ./. {}).overrideAttrs ( { nativeBuildInputs ? [], env ? {}, ... }: @@ -10,7 +15,8 @@ import ../../lib/call-package.nix ({ callSpectrumPackage, stdenv, qemu_kvm, root env = env // { OVMF_CODE = "${qemu_kvm}/share/qemu/edk2-${stdenv.hostPlatform.qemuArch}-code.fd"; - ROOT_FS = rootfs; + ROOT_FS = efi.rootfs; + EFI_IMAGE = efi; }; } )) (_: {}) -- 2.52.0