From 377c8bce8ccb555298b3dcd16b1e5765e508dee4 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Sat, 9 Apr 2022 17:52:48 +0200
Subject: [PATCH] test: fix dist and tenv-root/ regression from refactor

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 test/Makefile.am      | 26 +++++++++++++-------------
 test/setup-root.sh    |  2 ++
 test/tenv/Makefile.am |  3 +--
 test/tenv/root.mk     |  3 ++-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 50380d2a..af63d250 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,18 +1,18 @@
 SUBDIRS                  = common tenv
 
-EXTRA_DIST		 = skel/bin/busybox-x86_64.md5 skel/bin/service.sh skel/bin/slay \
-			   skel/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty	 \
-			   skel/etc/inittab skel/etc/hostname skel/etc/fstab 		 \
-			   skel/etc/init.d/rcS skel/etc/init.d/rcK skel/tmp/.empty	 \
-			   skel/etc/init.d/S01-service.sh skel/home/.empty		 \
-			   skel/proc/.empty skel/root/.empty skel/run/.empty		 \
-			   skel/sbin/chrootsetup.sh skel/srv/.empty skel/sys/.empty	 \
-			   skel/usr/bin/.empty skel/usr/lib/.empty skel/usr/sbin/.empty	 \
-			   skel/usr/games/.empty skel/usr/src/.empty			 \
-			   skel/usr/share/.empty skel/usr/include/.empty		 \
-			   skel/usr/local/games/.empty skel/usr/local/sbin/.empty	 \
-			   skel/usr/local/share/.empty skel/usr/local/src/.empty	 \
-			   skel/usr/local/lib/.empty skel/usr/local/bin/.empty		 \
+EXTRA_DIST		 = skel/bin/busybox-x86_64.md5 skel/sbin/service.sh skel/bin/slay \
+			   skel/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty	  \
+			   skel/etc/inittab skel/etc/hostname skel/etc/fstab 		  \
+			   skel/etc/init.d/rcS skel/etc/init.d/rcK skel/tmp/.empty	  \
+			   skel/etc/init.d/S01-service.sh skel/home/.empty		  \
+			   skel/proc/.empty skel/root/.empty skel/run/.empty		  \
+			   skel/sbin/chrootsetup.sh skel/srv/.empty skel/sys/.empty	  \
+			   skel/usr/bin/.empty skel/usr/lib/.empty skel/usr/sbin/.empty	  \
+			   skel/usr/games/.empty skel/usr/src/.empty			  \
+			   skel/usr/share/.empty skel/usr/include/.empty		  \
+			   skel/usr/local/games/.empty skel/usr/local/sbin/.empty	  \
+			   skel/usr/local/share/.empty skel/usr/local/src/.empty	  \
+			   skel/usr/local/lib/.empty skel/usr/local/bin/.empty		  \
 			   skel/usr/local/etc/.empty skel/var/run
 
 EXTRA_DIST		+= setup-root.sh
diff --git a/test/setup-root.sh b/test/setup-root.sh
index b9a63984..2415ec68 100755
--- a/test/setup-root.sh
+++ b/test/setup-root.sh
@@ -4,6 +4,8 @@ set -eu
 
 # shellcheck disable=SC2154
 make -C "$top_builddir" DESTDIR="$TENV_ROOT" install
+
+mkdir -p "$TENV_ROOT/sbin/"
 cp "$top_builddir/test/common/serv" "$TENV_ROOT/sbin/"
 
 # shellcheck disable=SC2154
diff --git a/test/tenv/Makefile.am b/test/tenv/Makefile.am
index bc7353cd..00ddb6ee 100644
--- a/test/tenv/Makefile.am
+++ b/test/tenv/Makefile.am
@@ -1,2 +1 @@
-EXTRA_DIST	 = lib.sh exec.sh start.sh root.mk busybox-x86_64.md5
-EXTRA_DIST	+= chrootsetup.sh
+EXTRA_DIST	 = lib.sh exec.sh start.sh root.mk
diff --git a/test/tenv/root.mk b/test/tenv/root.mk
index 596689eb..bb0d73d0 100644
--- a/test/tenv/root.mk
+++ b/test/tenv/root.mk
@@ -46,6 +46,7 @@ all: $(libs) $(DEST)/bin/$(BBBIN)
 $(DEST)/bin/$(BBBIN).md5:
 	@mkdir -p $(DEST)
 	@cp -a $(SKEL)/* $(DEST)/
+	@chmod -R u+w $(DEST)/
 	@find $(DEST) -name .empty -delete
 
 $(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5
@@ -71,6 +72,6 @@ $(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5
 	fi)
 	@chmod +x $@
 
-$(libs):
+$(libs): $(DEST)/bin/$(BBBIN).md5
 	mkdir -p $(dir $@)
 	cp $(patsubst $(abspath $(DEST))%,%,$@) $@