- Spectrum Development - spectrum-os.org

Binary cache
by Alyssa Ross 14 Apr '22

14 Apr '22

I'm happy to report that we finally have a Spectrum binary cache set up, which mitigate the very long build times that have been frustrating people attempting to try out Spectrum for themselves. URL: https://cache.dataaturservice.se/spectrum/ Signing key: spectrum-os.org-1:rnnSumz3+Dbs5uewPlwZSTP0k3g/5SRG4hD7Wbr9YuQ= The build infrastructure is hosted on Vultr, and is accessible by me and Puck. Storage is provided by Daniel Kuehn (lejonet). We don't have logs in the cache yet, due to a Nix bug[1]. My aim with this service is to provide low-cost and easy-to-run convenience for people interested in trying out Spectrum early, so don't assume this architecture is reflective of that of any future, higher stakes project infrastructure. Thanks to everybody who's helped me get this up and running over the last couple of weeks. I'll write some documentation about how to use it and link to it from the "Getting Spectrum" docs, and publish the configuration etc. for the build infrastructure soon but I've been pushing myself very hard to get this done in the first place, so I need a break from it first. In future I'd also like to explore possibilities for additional mirrors of the binary cache (lots of people have offered me storage hosting over the years!), but there are some additional technical challenges to solve before I can commit to that. Alyssa [1]: https://github.com/NixOS/nix/issues/6403

1 0

[PATCH] Don't assume /var/empty exists in Makefiles
by Alyssa Ross 10 Apr '22

10 Apr '22

It apparently doesn't on Ubuntu, and this way we also don't have to hack around it being missing in the Nix sandbox. Reported-by: Ville Ilvonen <ville.ilvonen(a)unikie.com> --- host/rootfs/Makefile | 9 ++++++--- host/rootfs/default.nix | 5 ----- vm/app/catgirl/Makefile | 9 ++++++--- vm/app/catgirl/default.nix | 5 ----- vm/app/lynx/Makefile | 9 ++++++--- vm/app/lynx/default.nix | 5 ----- vm/sys/net/Makefile | 9 ++++++--- vm/sys/net/default.nix | 5 ----- 8 files changed, 24 insertions(+), 32 deletions(-) diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile index 87bc15e..d78cc4c 100644 --- a/host/rootfs/Makefile +++ b/host/rootfs/Makefile @@ -45,15 +45,18 @@ LINKS = bin sbin BUILD_FILES = build/etc/mdev/modalias.sh build/etc/s6-rc MOUNTPOINTS = dev ext run proc sys -build/rootfs.tar: $(PACKAGES_TAR) $(FILES) $(BUILD_FILES) +build/empty: + mkdir -p $@ + +build/rootfs.tar: build/empty $(PACKAGES_TAR) $(FILES) $(BUILD_FILES) cp --no-preserve=mode -f $(PACKAGES_TAR) $@ tar $(TARFLAGS) --append -f $@ $(FILES) $(LINKS) echo $(BUILD_FILES) | cut -d/ -f2 | \ tar $(TARFLAGS) --append -f $@ -C build -T - for m in $(MOUNTPOINTS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," /var/empty ; \ + tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' /var/empty + tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty build/etc/mdev/modules.map: scripts/modprobe/gen_modules.map.awk mkdir -p $$(dirname $@) diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index cb02445..0bef7ba 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -94,11 +94,6 @@ stdenv.mkDerivation { MODULES_ORDER = "${kernel}/lib/modules/${kernel.modDirVersion}/modules.order"; PACKAGES_TAR = packagesTar; - postPatch = '' - mkdir $NIX_BUILD_TOP/empty - substituteInPlace Makefile --replace /var/empty $NIX_BUILD_TOP/empty - ''; - installPhase = '' cp build/rootfs.ext4 $out ''; diff --git a/vm/app/catgirl/Makefile b/vm/app/catgirl/Makefile index 5029bb4..3ee5842 100644 --- a/vm/app/catgirl/Makefile +++ b/vm/app/catgirl/Makefile @@ -55,15 +55,18 @@ VM_LINKS = bin etc/ssl/certs/ca-certificates.crt VM_BUILD_FILES = build/etc/s6-rc VM_MOUNTPOINTS = dev run proc sys -build/rootfs.tar: $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) +build/empty: + mkdir -p $@ + +build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) cp --no-preserve=mode -f $(PACKAGES_TAR) $@ tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS) echo $(VM_BUILD_FILES) | cut -d/ -f2 | \ tar $(TARFLAGS) --append -f $@ -C build -T - for m in $(VM_MOUNTPOINTS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," /var/empty ; \ + tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' /var/empty + tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty VM_S6_RC_FILES = \ etc/s6-rc/catgirl/run \ diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix index 230da00..bf35d04 100644 --- a/vm/app/catgirl/default.nix +++ b/vm/app/catgirl/default.nix @@ -74,11 +74,6 @@ stdenv.mkDerivation { PACKAGES_TAR = packagesTar; VMLINUX = "${kernel.dev}/vmlinux"; - postPatch = '' - mkdir $NIX_BUILD_TOP/empty - substituteInPlace Makefile --replace /var/empty $NIX_BUILD_TOP/empty - ''; - installPhase = '' mv build/svc $out ''; diff --git a/vm/app/lynx/Makefile b/vm/app/lynx/Makefile index f449d27..016b1f5 100644 --- a/vm/app/lynx/Makefile +++ b/vm/app/lynx/Makefile @@ -55,15 +55,18 @@ VM_LINKS = bin etc/ssl/certs/ca-certificates.crt VM_BUILD_FILES = build/etc/s6-rc VM_MOUNTPOINTS = dev run proc sys -build/rootfs.tar: $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) +build/empty: + mkdir -p $@ + +build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) cp --no-preserve=mode -f $(PACKAGES_TAR) $@ tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS) echo $(VM_BUILD_FILES) | cut -d/ -f2 | \ tar $(TARFLAGS) --append -f $@ -C build -T - for m in $(VM_MOUNTPOINTS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," /var/empty ; \ + tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' /var/empty + tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty VM_S6_RC_FILES = \ etc/s6-rc/lynx/run \ diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix index f7791d8..b188794 100644 --- a/vm/app/lynx/default.nix +++ b/vm/app/lynx/default.nix @@ -74,11 +74,6 @@ stdenv.mkDerivation { PACKAGES_TAR = packagesTar; VMLINUX = "${kernel.dev}/vmlinux"; - postPatch = '' - mkdir $NIX_BUILD_TOP/empty - substituteInPlace Makefile --replace /var/empty $NIX_BUILD_TOP/empty - ''; - installPhase = '' mv build/svc $out ''; diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 642c815..7103c0e 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -55,15 +55,18 @@ VM_LINKS = bin var/run VM_BUILD_FILES = build/etc/s6-rc VM_MOUNTPOINTS = dev run proc sys var/lib/connman -build/rootfs.tar: $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) +build/empty: + mkdir -p $@ + +build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) cp --no-preserve=mode -f $(PACKAGES_TAR) $@ tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS) echo $(VM_BUILD_FILES) | cut -d/ -f2 | \ tar $(TARFLAGS) --append -f $@ -C build -T - for m in $(VM_MOUNTPOINTS); do \ - tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," /var/empty ; \ + tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' /var/empty + tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty VM_S6_RC_FILES = \ etc/s6-rc/connman/dependencies \ diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index e3bd996..55ae9cb 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -83,11 +83,6 @@ stdenv.mkDerivation { PACKAGES_TAR = packagesTar; VMLINUX = "${kernel.dev}/vmlinux"; - postPatch = '' - mkdir $NIX_BUILD_TOP/empty - substituteInPlace Makefile --replace /var/empty $NIX_BUILD_TOP/empty - ''; - installPhase = '' mv build/svc $out ''; -- 2.35.1

2 1

Spectrum Status Update, March 2022
by Alyssa Ross 02 Apr '22

02 Apr '22

Hi all, I thought I'd try a different format of update. It's difficult to find the time for the big This Week in Spectrum updates I've tried to do before, but I'd like to provide some sort of account of what I've been doing. So, here's an overview of what I did in March. I'm happy to expand on any of it that sounds interesting — just hit Reply All and tell me what you'd like to hear more about! I'm also interested to hear what you think of this status update format. I'd like to get better about communicating what I'm working on, in a sustainable way. Let me know if you have any suggestions! Miscellaneous ------------- • Edited and published demo video[1] • Set up an IRC bot to post incoming mailing list messages • Switched from Busybox's modprobe to kmod • Removed unused dependencies • Various other cleanups and fixes • Started work towards CI for Spectrum • Prototyped a shared base image for application VMs [1]: https://diode.zone/w/dWAWHR38Zu3feRtDKjVEJb virtiofs investigation ---------------------- • Prototyped virtiofs VM filesystem access • Reported a bug: "Can't run unprivileged any more due to setgroups"[2] • Participated in discussion and testing of Musl port[3][4][5] [2]: https://gitlab.com/virtio-fs/virtiofsd/-/issues/36 [3]: https://github.com/slp/capng/pull/2#issuecomment-1059976861 [4]: https://github.com/slp/capng/pull/3 [5]: https://github.com/rust-lang/libc/pull/2713 Spectrum-related upstream Nixpkgs commits ----------------------------------------- • lvm2: don't use targetPlatform (05a6c124e65) • coreutils: add debug output (e30f0f31e8d) • pkgsMusl.systemd: fix build for 250.4 (39eee39fd92) • nghttp2: only run tests on GNU (8685cea963b) • python3.pkgs.importlib-metadata: fix cross (3c7b77e638b) • spidermonkey: use the same LLVM as rustc (3ff5f0eb764) • pkgsStatic.stdenv.cc.cc: put static libs in $lib (12c37aec377) • Revert "gcc: Always pass `--enable-shared` by default" (c6dd11ca39a) • libudev-zero: 1.0.0 -> 1.0.1 (c7b7ad77985) • linux_latest: 5.16.14 -> 5.17 (58ae11758e8) • crosvm: 81.12871.0.0-rc1 -> 99.14468.0.0-rc1 (6aefdafbed9) • shadow: 4.8.1 -> 4.8.11 (8d35d7e2bf1) • pkgsMusl.libnetfilter_conntrack: fix build (2cc5ec86571) • pkgsMusl.systemdMinimal: fix build (b8734c50e29) • linux.configfile: fix alts containing "/m" (fb079c3110d) • cloud-hypervisor: 21.0 -> 22.0 (36a211e1ee3) • edk2: 202108 -> 202202 (9222b68380e) • kmod: add dev and lib outputs (dc1303185f8) • systemd: update patchShebangs comment (a0bfc8e7c1f) • systemd: fix a whole bunch of typos (479b1cb510b) Pending Spectrum related Nixpkgs PRs ------------------------------------ • crosvm: add support for virgl_renderer{,_next} (#165128) • qemu: 6.2.0 -> 7.0.0 (#165291) Spectrum infra related upstream Nixpkgs commits ----------------------------------------------- • irccat: init at 0.4.8 (ce8cbe3c01f) • git: enable debug info (4345b27dedf) • cgit-pink: init at 1.3.0 (deab83e1167) • mailman-web: fix django version check removal (3512f5b7075) Demo video related upstream Nixpkgs commits ------------------------------------------- • ccsymbols: init at 2020-04-19 (cf7556eea5a)

1 0

[PATCH] img/live: increase ESP size
by Alyssa Ross 27 Mar '22

27 Mar '22

Switching from Busybox to kmod modprobe has left us needing a bit more space. Reported-by: Ville Ilvonen <ville.ilvonen(a)unikie.com> Fixes: cf7e089 ("Busybox modprobe is banned") --- img/live/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/img/live/Makefile b/img/live/Makefile index e9b760c..319895a 100644 --- a/img/live/Makefile +++ b/img/live/Makefile @@ -34,7 +34,7 @@ build/bootx64.efi: etc/os-release build/cmdline $(INITRAMFS) $(EFI_STUB) $@ build/boot.fat: build/bootx64.efi - $(TRUNCATE) -s 209715200 $@ + $(TRUNCATE) -s 220200960 $@ $(MKFS_FAT) $@ $(MMD) -i $@ ::/EFI ::/EFI/BOOT $(MCOPY) -i $@ build/bootx64.efi ::/EFI/BOOT -- 2.35.1

2 1

[PATCH 1/2] Busybox modprobe is banned
by Alyssa Ross 22 Mar '22

22 Mar '22

Trying to use modprobe from Busybox has caused nothing but problems. The latest issue is that it doesn't implement softdep at all. rootfs.ext4 before: 509M rootfs.ext4 after: 513M Thanks-to: Puck Meerburg <puck(a)puckipedia.com> --- host/initramfs/default.nix | 8 +++++++- host/rootfs/default.nix | 10 ++++++++-- vm/app/catgirl/default.nix | 15 +++++++++++++-- vm/app/lynx/default.nix | 15 +++++++++++++-- vm/sys/net/default.nix | 15 +++++++++++++-- 5 files changed, 54 insertions(+), 9 deletions(-) diff --git a/host/initramfs/default.nix b/host/initramfs/default.nix index b207ace..5ce198a 100644 --- a/host/initramfs/default.nix +++ b/host/initramfs/default.nix @@ -16,7 +16,7 @@ let linux = rootfs.kernel; packages = [ - pkgsStatic.mdevd pkgsStatic.execline + pkgsStatic.execline pkgsStatic.kmod pkgsStatic.mdevd (pkgsStatic.cryptsetup.override { programs = { @@ -29,7 +29,13 @@ let (busybox.override { enableStatic = true; extraConfig = '' + CONFIG_DEPMOD n CONFIG_FINDFS n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n ''; }) ]; diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index b9fabee..2f2c368 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -4,7 +4,7 @@ { pkgs ? import <nixpkgs> {} }: pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, s6-rc, tar2ext4 -, busybox, cloud-hypervisor, cryptsetup, execline, jq, mdevd, s6 +, busybox, cloud-hypervisor, cryptsetup, execline, jq, kmod, mdevd, s6 , s6-linux-utils, s6-portable-utils, socat, util-linuxMinimal, xorg }: @@ -20,7 +20,7 @@ let foot = pkgsGui.foot.override { allowPgo = false; }; packages = [ - cloud-hypervisor execline jq mdevd s6 s6-linux-utils + cloud-hypervisor execline jq kmod mdevd s6 s6-linux-utils s6-portable-utils s6-rc socat start-vm (cryptsetup.override { @@ -33,8 +33,14 @@ let (busybox.override { extraConfig = '' + CONFIG_DEPMOD n CONFIG_FINDFS n CONFIG_INIT n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n ''; }) ] ++ (with pkgsGui; [ foot westonLite ]); diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix index ed897eb..716e7dd 100644 --- a/vm/app/catgirl/default.nix +++ b/vm/app/catgirl/default.nix @@ -9,7 +9,7 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4 -, busybox, cacert, catgirl, execline, mdevd, s6, s6-linux-utils +, busybox, cacert, catgirl, execline, kmod, mdevd, s6, s6-linux-utils , s6-portable-utils }: @@ -17,7 +17,18 @@ let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; packages = [ - busybox catgirl execline mdevd s6 s6-linux-utils s6-portable-utils s6-rc + catgirl execline kmod mdevd s6 s6-linux-utils s6-portable-utils s6-rc + + (busybox.override { + extraConfig = '' + CONFIG_DEPMOD n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n + ''; + }) ]; packagesSysroot = runCommand "packages-sysroot" { diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix index 90fda0f..72bff7f 100644 --- a/vm/app/lynx/default.nix +++ b/vm/app/lynx/default.nix @@ -9,7 +9,7 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4 -, busybox, cacert, execline, lynx, mdevd, s6, s6-linux-utils +, busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-linux-utils , s6-portable-utils }: @@ -17,7 +17,18 @@ let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; packages = [ - busybox execline lynx mdevd s6 s6-linux-utils s6-portable-utils s6-rc + execline kmod lynx mdevd s6 s6-linux-utils s6-portable-utils s6-rc + + (busybox.override { + extraConfig = '' + CONFIG_DEPMOD n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n + ''; + }) ]; packagesSysroot = runCommand "packages-sysroot" { diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index a9e1fdc..62a13bb 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -9,7 +9,7 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4, xorg -, busybox, connmanMinimal, dbus, execline, mdevd, nftables, s6 +, busybox, connmanMinimal, dbus, execline, kmod, mdevd, nftables, s6 , s6-linux-utils, s6-portable-utils }: @@ -19,9 +19,20 @@ let connman = connmanMinimal; packages = [ - busybox connman dbus execline mdevd s6 s6-linux-utils + connman dbus execline kmod mdevd s6 s6-linux-utils s6-portable-utils s6-rc + (busybox.override { + extraConfig = '' + CONFIG_DEPMOD n + CONFIG_INSMOD n + CONFIG_LSMOD n + CONFIG_MODINFO n + CONFIG_MODPROBE n + CONFIG_RMMOD n + ''; + }) + (nftables.override { withCli = false; }) ]; -- 2.35.1

2 3

[PATCH] use statically linked cryptsetup in initramfs
by Yureka 16 Feb '22

16 Feb '22

--- host/initramfs/default.nix | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/host/initramfs/default.nix b/host/initramfs/default.nix index ba6ede2..91e598f 100644 --- a/host/initramfs/default.nix +++ b/host/initramfs/default.nix @@ -2,15 +2,38 @@ { lib, stdenv, runCommand, writeReferencesToFile, pkgsStatic , busybox, cpio, cryptsetup, linux, lvm2 +, fetchpatch }: -let - cryptsetup' = cryptsetup; -in let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; - cryptsetup = cryptsetup'.override { lvm2 = lvm2.override { udev = null; }; }; + # https://github.com/NixOS/nixpkgs/pull/148948 + cryptsetup = (pkgsStatic.cryptsetup.override { + lvm2 = (pkgsStatic.lvm2.override { + udev = null; + }).overrideAttrs (old: { + patches = (old.patches or []) ++ [ + (fetchpatch { + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/bf8b0d818a6c5fa65f318603756…"; + sha256 = "sha256-t67Osvcn92R7q9V+KDW+SyJDmajzVbnTPONlokcBU9U="; + }) + ]; + configureFlags = old.configureFlags ++ [ "--enable-static_link" ]; + makeFlags = old.makeFlags ++ [ "libdm.device-mapper" ]; + installPhase = '' + install -D -t $out/lib libdm/ioctl/libdevmapper.a + make -C libdm install_include + make -C libdm install_pkgconfig + ''; + outputs = [ "out" ]; + }); + }).overrideAttrs (old: { + NIX_LDFLAGS = ""; + configureFlags = old.configureFlags ++ [ + "--enable-static-cryptsetup" + ]; + }); packages = [ cryptsetup pkgsStatic.mdevd pkgsStatic.execline -- 2.34.0

2 1

[PATCH] installer: operate on FAT image directly
by Alyssa Ross 01 Feb '22

01 Feb '22

--- It feels cleaner to me to operate directly on the FAT image, rather than constructing the directory on the build filesystem and then copying it into the FAT image at the end. But, I'm wondering if maybe there's a reason it's better to do it the other way that I've missed? installer/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/installer/default.nix b/installer/default.nix index f7e84ac..0818091 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -24,6 +24,7 @@ let esp = runCommand "esp.img" { nativeBuildInputs = [ grub libfaketime dosfstools mtools ]; + grubTargetDir = "${grub}/lib/grub/${grub.grubTarget}"; # Definition copied from util/grub-install-common.c. # Last checked: GRUB 2.06 pkglib_DATA = [ @@ -31,23 +32,23 @@ let "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" "modinfo.sh" ]; } '' - mkdir -p files/grub/${grub.grubTarget} - cp ${grubCfg} files/grub/grub.cfg - cp ${grub}/lib/grub/${grub.grubTarget}/*.mod files/grub/${grub.grubTarget} + truncate -s 15M $out + faketime "1970-01-01 00:00:00" mkfs.vfat -i 0x2178694e -n EFI $out + mmd -i $out ::/EFI ::/EFI/BOOT \ + ::/grub ::/grub/${grub.grubTarget} ::/grub/fonts + + mcopy -i $out ${grubCfg} ::/grub/grub.cfg + mcopy -i $out $grubTargetDir/*.mod ::/grub/${grub.grubTarget} for file in $pkglib_DATA; do - path="${grub}/lib/grub/${grub.grubTarget}/$file" - ! [ -e "$path" ] || cp "$path" files/grub/${grub.grubTarget} + path="$grubTargetDir/$file" + ! [ -e "$path" ] || mcopy -i $out "$path" ::/grub/${grub.grubTarget} done + mcopy -i $out ${grub}/share/grub/unicode.pf2 ::/grub/fonts - install -D ${grub}/share/grub/unicode.pf2 files/grub/fonts/unicode.pf2 grub-mkimage -o grubx64.efi -p "(hd0,gpt1)/grub" -O ${grub.grubTarget} part_gpt fat - install -D grubx64.efi files/EFI/BOOT/BOOTX64.EFI + mcopy -i $out grubx64.efi ::/EFI/BOOT/BOOTX64.EFI - img=$out - truncate -s 15M $img - faketime "1970-01-01 00:00:00" mkfs.vfat -i 0x2178694e -n EFI $img - (cd files; mcopy -psvm -i $img ./* ::) - fsck.vfat -vn $img + fsck.vfat -n $out ''; installer = runCommand "installer.img" { -- 2.33.0

1 0

[PATCH] installer: more closely match grub-install
by Alyssa Ross 12 Jan '22

12 Jan '22

The main motivation here is that I noticed we're installing a lot of *.module files that grub-install didn't include. After this change, we're still differing from what grub-install does in the following ways: • Locale files are still not included • grub/x86_64-efi/core.efi or grub/x86_64-efi/grub.efi are not included. I'm not sure where those executables come from, but they don't seem to be required. • We're still not creating a grubenv file, which should be fine because there's no data that might need to be persisted anyway. --- installer/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/installer/default.nix b/installer/default.nix index 9fc7493..f7e84ac 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -24,10 +24,22 @@ let esp = runCommand "esp.img" { nativeBuildInputs = [ grub libfaketime dosfstools mtools ]; + # Definition copied from util/grub-install-common.c. + # Last checked: GRUB 2.06 + pkglib_DATA = [ + "efiemu32.o" "efiemu64.o" "moddep.lst" "command.lst" "fs.lst" "partmap.lst" + "parttool.lst" "video.lst" "crypto.lst" "terminal.lst" "modinfo.sh" + ]; } '' - install -D ${grubCfg} files/grub/grub.cfg - cp -r ${grub}/lib/grub/${grub.grubTarget} files/grub/ - cp ${grub}/share/grub/unicode.pf2 files/grub/ + mkdir -p files/grub/${grub.grubTarget} + cp ${grubCfg} files/grub/grub.cfg + cp ${grub}/lib/grub/${grub.grubTarget}/*.mod files/grub/${grub.grubTarget} + for file in $pkglib_DATA; do + path="${grub}/lib/grub/${grub.grubTarget}/$file" + ! [ -e "$path" ] || cp "$path" files/grub/${grub.grubTarget} + done + + install -D ${grub}/share/grub/unicode.pf2 files/grub/fonts/unicode.pf2 grub-mkimage -o grubx64.efi -p "(hd0,gpt1)/grub" -O ${grub.grubTarget} part_gpt fat install -D grubx64.efi files/EFI/BOOT/BOOTX64.EFI base-commit: 907294e4a85e77e5db116a73ecfdf9a406be663b -- 2.33.0

1 0

[PATCH] fix imports after repo merge
by Yureka 16 Dec '21

16 Dec '21

--- host/initramfs/extfs.nix | 6 +++--- host/initramfs/live.nix | 2 +- host/rootfs/default.nix | 6 +++--- installer/default.nix | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/host/initramfs/extfs.nix b/host/initramfs/extfs.nix index b26f6e1..c50df21 100644 --- a/host/initramfs/extfs.nix +++ b/host/initramfs/extfs.nix @@ -1,17 +1,17 @@ { pkgs, runCommand, s6-rc, tar2ext4 }: let - netvm = import ../spectrum-netvm { + netvm = import ../../vm/sys/net { inherit pkgs; # inherit (foot) terminfo; }; - appvm-catgirl = import ../spectrum-appvm-catgirl { + appvm-catgirl = import ../../vm/app/catgirl { inherit pkgs; # inherit (foot) terminfo; }; - appvm-lynx = import ../spectrum-appvm-lynx { + appvm-lynx = import ../../vm/app/lynx { inherit pkgs; # inherit (foot) terminfo; }; diff --git a/host/initramfs/live.nix b/host/initramfs/live.nix index 27d868b..6446593 100644 --- a/host/initramfs/live.nix +++ b/host/initramfs/live.nix @@ -6,7 +6,7 @@ let initramfs = callPackage ./. { }; - host-rootfs = import ../spectrum-rootfs { inherit pkgs; }; + host-rootfs = import ../rootfs { inherit pkgs; }; extfs = pkgsStatic.callPackage ./extfs.nix { inherit pkgs; }; kernelTarget = stdenv.hostPlatform.linux-kernel.target; diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index fc347aa..21a9818 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -62,17 +62,17 @@ let -T ${writeReferencesToFile packagesSysroot} . ''; - netvm = import ../spectrum-netvm { + netvm = import ../../vm/sys/net { inherit pkgs; inherit (foot) terminfo; }; - appvm-catgirl = import ../spectrum-appvm-catgirl { + appvm-catgirl = import ../../vm/app/catgirl { inherit pkgs; inherit (foot) terminfo; }; - appvm-lynx = import ../spectrum-appvm-lynx { + appvm-lynx = import ../../vm/app/lynx { inherit pkgs; inherit (foot) terminfo; }; diff --git a/installer/default.nix b/installer/default.nix index 183a962..0685bdd 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -8,7 +8,7 @@ let inherit (pkgs.lib) removePrefix; inherit (nixos ./configuration.nix) config; - image = import ../spectrum-initramfs/live.nix { inherit pkgs; }; + image = import ../host/initramfs/live.nix { inherit pkgs; }; grub = grub2_efi; -- 2.34.0

2 1

[PATCH 1/2] increase partition sizes
by Yureka 16 Dec '21

16 Dec '21

--- host/initramfs/live.nix | 2 +- installer/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/host/initramfs/live.nix b/host/initramfs/live.nix index 6446593..5dc4f87 100644 --- a/host/initramfs/live.nix +++ b/host/initramfs/live.nix @@ -29,7 +29,7 @@ let nativeBuildInputs = [ dosfstools mtools ]; passthru = { inherit uki; }; } '' - truncate -s ${toString (100 * 1024 * 1024)} $out + truncate -s ${toString (150 * 1024 * 1024)} $out mkfs.vfat $out mmd -i $out ::/EFI ::/EFI/BOOT mcopy -i $out ${uki} ::/EFI/BOOT/BOOTX64.EFI diff --git a/installer/default.nix b/installer/default.nix index 0685bdd..39933d9 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -35,7 +35,7 @@ let eosimages = vmTools.runInLinuxVM (runCommand "eosimages.img" { nativeBuildInputs = [ exfatprogs kmod util-linux ]; } '' - truncate -s 4G "$out" + truncate -s 5G "$out" mkfs.exfat -L eosimages "$out" mkdir /mnt modprobe loop -- 2.34.0

2 2