diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-04-12 18:56:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-04-13 08:19:23 +0000 |
| commit | f7f4c05b1ced423724db3a3580c35b3825caff4c (patch) | |
| tree | d9bc440a8ad08fc47fa8eeb583fba059981abd8d /vm | |
| parent | 287b17a6367f5e2e91dd91fb11169f0554106fb2 (diff) | |
| download | spectrum-f7f4c05b1ced423724db3a3580c35b3825caff4c.tar spectrum-f7f4c05b1ced423724db3a3580c35b3825caff4c.tar.gz spectrum-f7f4c05b1ced423724db3a3580c35b3825caff4c.tar.bz2 spectrum-f7f4c05b1ced423724db3a3580c35b3825caff4c.tar.lz spectrum-f7f4c05b1ced423724db3a3580c35b3825caff4c.tar.xz spectrum-f7f4c05b1ced423724db3a3580c35b3825caff4c.tar.zst spectrum-f7f4c05b1ced423724db3a3580c35b3825caff4c.zip | |
Remove redundant VMLINUX make variables
Both places this was used, there was a KERNEL variable with the same value. On other architectures, we might not even use vmlinux, so keeping KERNEL makes more sense. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/sys/net/Makefile | 4 | ||||
| -rw-r--r-- | vm/sys/net/default.nix | 2 | ||||
| -rw-r--r-- | vm/sys/net/shell.nix | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index abc92b3..7a024bd 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -24,9 +24,9 @@ $(prefix): $(HOST_BUILD_FILES) tar -c $(HOST_BUILD_FILES) | tar -C $@ -x --strip-components 2 -build/host/data/netvm/vmlinux: $(VMLINUX) +build/host/data/netvm/vmlinux: $(KERNEL) mkdir -p $$(dirname $@) - cp $(VMLINUX) $@ + cp $(KERNEL) $@ build/host/data/netvm/blk/root.img: ../../../scripts/make-gpt.sh ../../../scripts/sfdisk-field.awk build/rootfs.ext4 mkdir -p $$(dirname $@) diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index 19f749a..1f27b50 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ jq lseek s6-rc tar2ext4 util-linux ]; PACKAGES_TAR = packagesTar; - VMLINUX = "${kernel.dev}/vmlinux"; + KERNEL = "${kernel.dev}/vmlinux"; makeFlags = [ "prefix=$(out)" ]; diff --git a/vm/sys/net/shell.nix b/vm/sys/net/shell.nix index c0771e8..6e5b342 100644 --- a/vm/sys/net/shell.nix +++ b/vm/sys/net/shell.nix @@ -8,6 +8,4 @@ import ../../../lib/eval-config.nix ({ config, ... }: with config.pkgs; { nativeBuildInputs = nativeBuildInputs ++ [ cloud-hypervisor jq qemu_kvm reuse ]; - - KERNEL = "${passthru.kernel.dev}/vmlinux"; })) |