On 10/1/25 05:20, Alyssa Ross wrote:
Demi Marie Obenour <demiobenour@gmail.com> writes:
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 38a9af765683f287d621d5a2107a78c84b9b166e..6f8664aea3b2b9bfdf569c4b089695d2a575668a 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -4,6 +4,7 @@ .POSIX:
include ../../../lib/common.mk +include file-list.mk
prefix = build/host libdir = $(prefix)/lib @@ -28,62 +29,24 @@ $(vmdir)/netvm/blk/root.img: ../../../scripts/make-gpt.sh ../../../scripts/sfdis build/rootfs.erofs:root:ea21da27-0391-48da-9235-9d2ab2ca7844:root mv $@.tmp $@
-VM_FILES = \ - image/etc/dbus-1/system.conf \ - image/etc/fstab \ - image/etc/init \ - image/etc/mdev.conf \ - image/etc/mdev/iface \ - image/etc/nftables.conf \ - image/etc/passwd \ - image/etc/s6-linux-init/run-image/service/getty-hvc0/run \ - image/etc/s6-linux-init/scripts/rc.init \ - image/etc/sysctl.conf -VM_DIRS = dev etc/s6-linux-init/env proc run sys var/lib/connman
VM_DIRS should have been renamed to DIRS here, not removed. If there are no other issues I'll just fix that myself. Happily the tests caught it.
Whoops! That's what I get for accidentally trashing my NixOS install and not reinstalling quickly enough. I should be able to do better QA now that that machine is up and running again. -- Sincerely, Demi Marie Obenour (she/her/hers)