From 75d2f40704178a78eb1e050fdf6a8c377fee55e4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 28 Apr 2022 17:33:14 +0000
Subject: Create /etc/s6-linux-init/env/ to silence warning

---
 host/rootfs/Makefile    | 4 ++--
 vm/app/catgirl/Makefile | 7 ++++---
 vm/app/lynx/Makefile    | 8 ++++----
 vm/sys/net/Makefile     | 4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile
index 2f31499..005702a 100644
--- a/host/rootfs/Makefile
+++ b/host/rootfs/Makefile
@@ -37,13 +37,13 @@ FILES = \
 	usr/bin/vm-console \
 	usr/bin/vm-start \
 	usr/bin/vm-stop
+DIRS = dev etc/s6-linux-init/env ext run proc sys
 
 # These are separate because they need to be included, but putting
 # them as make dependencies would confuse make.
 LINKS = bin sbin
 
 BUILD_FILES = build/etc/mdev/modalias.sh build/etc/s6-rc
-MOUNTPOINTS = dev ext run proc sys
 
 build/empty:
 	mkdir -p $@
@@ -53,7 +53,7 @@ build/rootfs.tar: build/empty $(PACKAGES_TAR) $(FILES) $(BUILD_FILES)
 	tar $(TARFLAGS) --append -f $@ $(FILES) $(LINKS)
 	echo $(BUILD_FILES) | cut -d/ -f2 | \
 	    tar $(TARFLAGS) --append -f $@ -C build -T -
-	for m in $(MOUNTPOINTS); do \
+	for m in $(DIRS); do \
 	    tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \
 	done
 
diff --git a/vm/app/catgirl/Makefile b/vm/app/catgirl/Makefile
index 0d90a01..1c5a37c 100644
--- a/vm/app/catgirl/Makefile
+++ b/vm/app/catgirl/Makefile
@@ -48,6 +48,9 @@ VM_FILES = \
 	etc/passwd \
 	etc/resolv.conf \
 	etc/s6-linux-init/scripts/rc.init
+VM_DIRS = dev run proc sys \
+	etc/s6-linux-init/env \
+	etc/s6-linux-init/run-image/service
 
 # These are separate because they need to be included, but putting
 # them as make dependencies would confuse make.
@@ -64,11 +67,9 @@ build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES)
 	tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS)
 	echo $(VM_BUILD_FILES) | cut -d/ -f2 | \
 	    tar $(TARFLAGS) --append -f $@ -C build -T -
-	for m in $(VM_MOUNTPOINTS); do \
+	for m in $(VM_DIRS); do \
 	    tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \
 	done
-	tar $(TARFLAGS) --append -hf $@ \
-	    --xform='s,.*,etc/s6-linux-init/run-image/service,' build/empty
 
 VM_S6_RC_FILES = \
 	etc/s6-rc/catgirl/run \
diff --git a/vm/app/lynx/Makefile b/vm/app/lynx/Makefile
index e343fce..44f8b90 100644
--- a/vm/app/lynx/Makefile
+++ b/vm/app/lynx/Makefile
@@ -48,13 +48,15 @@ VM_FILES = \
 	etc/passwd \
 	etc/resolv.conf \
 	etc/s6-linux-init/scripts/rc.init
+VM_DIRS = dev run proc sys \
+	etc/s6-linux-init/env \
+	etc/s6-linux-init/run-image/service
 
 # These are separate because they need to be included, but putting
 # them as make dependencies would confuse make.
 VM_LINKS = bin etc/ssl/certs/ca-certificates.crt
 
 VM_BUILD_FILES = build/etc/s6-rc
-VM_MOUNTPOINTS = dev run proc sys
 
 build/empty:
 	mkdir -p $@
@@ -64,11 +66,9 @@ build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES)
 	tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS)
 	echo $(VM_BUILD_FILES) | cut -d/ -f2 | \
 	    tar $(TARFLAGS) --append -f $@ -C build -T -
-	for m in $(VM_MOUNTPOINTS); do \
+	for m in $(VM_DIRS); do \
 	    tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \
 	done
-	tar $(TARFLAGS) --append -hf $@ \
-		--xform='s,.*,etc/s6-linux-init/run-image/service,' build/empty
 
 VM_S6_RC_FILES = \
 	etc/s6-rc/lynx/run \
diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile
index d190ebf..3eac98d 100644
--- a/vm/sys/net/Makefile
+++ b/vm/sys/net/Makefile
@@ -48,13 +48,13 @@ VM_FILES = \
 	etc/s6-linux-init/run-image/service/getty-hvc0/run \
 	etc/s6-linux-init/scripts/rc.init \
 	etc/sysctl.conf
+VM_DIRS = dev etc/s6-linux-init/env run proc sys var/lib/connman
 
 # These are separate because they need to be included, but putting
 # them as make dependencies would confuse make.
 VM_LINKS = bin var/run
 
 VM_BUILD_FILES = build/etc/s6-rc
-VM_MOUNTPOINTS = dev run proc sys var/lib/connman
 
 build/empty:
 	mkdir -p $@
@@ -64,7 +64,7 @@ build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES)
 	tar $(TARFLAGS) --append -f $@ $(VM_FILES) $(VM_LINKS)
 	echo $(VM_BUILD_FILES) | cut -d/ -f2 | \
 	    tar $(TARFLAGS) --append -f $@ -C build -T -
-	for m in $(VM_MOUNTPOINTS); do \
+	for m in $(VM_DIRS); do \
 	    tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \
 	done
 
-- 
cgit 1.4.1