From 01498855f84ee87d66e6295efcaf7a32d67f4dad Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 22 Feb 2023 12:44:00 +0000 Subject: nix: centralise source cleaning This was getting very repetitive. Having a single copy of the sources shared between builds will also save on store space, and means we don't need to support overriding the path to the scripts directory in Makefiles. Signed-off-by: Alyssa Ross --- vm/sys/net/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'vm/sys/net/Makefile') diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 2b9004b..076e991 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -8,7 +8,6 @@ QEMU_KVM = qemu-kvm CLOUD_HYPERVISOR = cloud-hypervisor VMM = qemu -SCRIPTS = ../../../scripts HOST_BUILD_FILES = \ build/host/data/netvm/blk/root.img \ @@ -31,9 +30,9 @@ build/host/data/netvm/vmlinux: $(VMLINUX) mkdir -p $$(dirname $@) cp $(VMLINUX) $@ -build/host/data/netvm/blk/root.img: $(SCRIPTS)/make-gpt.sh $(SCRIPTS)/sfdisk-field.awk build/rootfs.ext4 +build/host/data/netvm/blk/root.img: ../../../scripts/make-gpt.sh ../../../scripts/sfdisk-field.awk build/rootfs.ext4 mkdir -p $$(dirname $@) - $(SCRIPTS)/make-gpt.sh $@.tmp \ + ../../../scripts/make-gpt.sh $@.tmp \ build/rootfs.ext4:4f68bce3-e8cd-4db1-96e7-fbcaf984b709:ea21da27-0391-48da-9235-9d2ab2ca7844:root mv $@.tmp $@ -- cgit 1.4.1