From e78028e58fe3f60b1b71b35ad388622925f258a0 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Fri, 7 Oct 2022 00:23:04 +0100 Subject: [PATCH] make outputs.directory useful for tftp-booting devices basically, add some more symlinks to it --- default.nix | 12 +++++++----- devices/gl-ar750.nix | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/default.nix b/default.nix index e403b60..0a2b3aa 100644 --- a/default.nix +++ b/default.nix @@ -37,11 +37,13 @@ let dd if=${uimage} of=$out/firmware.bin bs=128k conv=sync dd if=${squashfs} of=$out/firmware.bin bs=128k conv=sync,nocreat,notrunc oflag=append ''; - directory = nixpkgs.pkgs.runCommand "both-kinds" {} '' - mkdir $out - cd $out - ln -s ${squashfs} squashfs - ln -s ${kernel.vmlinux} vmlinux + directory = nixpkgs.pkgs.runCommand "liminix" {} '' + mkdir $out + cd $out + ln -s ${squashfs} squashfs + ln -s ${kernel.vmlinux} vmlinux + ln -s ${manifest} manifest + ln -s ${uimage} uimage ''; # this exists so that you can run "nix-store -q --tree" on it and find # out what's in the image, which is nice if it's unexpectedly huge diff --git a/devices/gl-ar750.nix b/devices/gl-ar750.nix index d102c59..a85ae47 100644 --- a/devices/gl-ar750.nix +++ b/devices/gl-ar750.nix @@ -83,7 +83,7 @@ # "KEYS" = "y"; }; }; - outputs.default = "combined-image"; + outputs.default = "directory"; boot = { loadAddress = "0x80060000"; entryPoint = "0x80060000";