diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-03-16 14:41:29 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-03-16 14:41:29 +0000 |
| commit | 35f8ba0a582a0d387de5c603bc0b892ceb3317c3 (patch) | |
| tree | 6fd754b8d1274d97a1282c05982c2e7ffe79ba7a /img/app/Makefile | |
| parent | 4f820899cf6674e472303a06865515a94714cf60 (diff) | |
| download | spectrum-35f8ba0a582a0d387de5c603bc0b892ceb3317c3.tar spectrum-35f8ba0a582a0d387de5c603bc0b892ceb3317c3.tar.gz spectrum-35f8ba0a582a0d387de5c603bc0b892ceb3317c3.tar.bz2 spectrum-35f8ba0a582a0d387de5c603bc0b892ceb3317c3.tar.lz spectrum-35f8ba0a582a0d387de5c603bc0b892ceb3317c3.tar.xz spectrum-35f8ba0a582a0d387de5c603bc0b892ceb3317c3.tar.zst spectrum-35f8ba0a582a0d387de5c603bc0b892ceb3317c3.zip | |
Put sockets created by Makefiles into build dirs
This way, we don't have to worry about them confusing Nix, or the lockfiles ending up in git. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'img/app/Makefile')
| -rw-r--r-- | img/app/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/img/app/Makefile b/img/app/Makefile index ed83133..372e14c 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -81,7 +81,8 @@ build/etc/s6-rc: $(VM_S6_RC_FILES) exit=$$?; rm -r $$dir; exit $$exit start-virtiofsd: - $(S6_IPCSERVER_SOCKETBINDER) -B virtiofsd.sock \ + mkdir -p build + $(S6_IPCSERVER_SOCKETBINDER) -B build/virtiofsd.sock \ $(BACKGROUND) $(VIRTIOFSD) --fd 0 --shared-dir . "" .PHONY: start-virtiofsd @@ -92,7 +93,7 @@ run-qemu: $(imgdir)/appvm/blk/root.img start-virtiofsd -append "console=ttyS0 root=PARTLABEL=root" \ -netdev user,id=net0 \ -device virtio-net,netdev=net0,mac=0A:B3:EC:00:00:00 \ - -chardev socket,id=virtiofsd,path=virtiofsd.sock \ + -chardev socket,id=virtiofsd,path=build/virtiofsd.sock \ -device vhost-user-fs-pci,chardev=virtiofsd,tag=virtiofs0 \ -object memory-backend-memfd,id=mem,size=128M,share=on \ -numa node,memdev=mem \ @@ -102,13 +103,13 @@ run-qemu: $(imgdir)/appvm/blk/root.img start-virtiofsd .PHONY: run-qemu run-cloud-hypervisor: $(imgdir)/appvm/blk/root.img start-virtiofsd - rm -f vmm.sock + rm -f build/vmm.sock $(CLOUD_HYPERVISOR) \ - --api-socket path=vmm.sock \ + --api-socket path=build/vmm.sock \ --memory size=128M,shared=on \ --disk path=$(imgdir)/appvm/blk/root.img,readonly=on \ path=$(RUN_IMG),readonly=on \ - --fs tag=virtiofs0,socket=virtiofsd.sock \ + --fs tag=virtiofs0,socket=build/virtiofsd.sock \ --kernel $(KERNEL) \ --cmdline "console=ttyS0 root=PARTLABEL=root" \ --console tty \ |