test: fix dist and tenv-root/ regression from refactor

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2022-04-09 17:52:48 +02:00
1 parent a39d958d25
commit 377c8bce8c
4 files changed
+6 -4

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
SUBDIRS = common tenv SUBDIRS = common tenv
EXTRA_DIST = skel/bin/busybox-x86_64.md5 skel/bin/service.sh skel/bin/slay \ 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/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty \
skel/etc/inittab skel/etc/hostname skel/etc/fstab \ 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/rcS skel/etc/init.d/rcK skel/tmp/.empty \
+2
View File
@@ -4,6 +4,8 @@ set -eu
# shellcheck disable=SC2154 # shellcheck disable=SC2154
make -C "$top_builddir" DESTDIR="$TENV_ROOT" install make -C "$top_builddir" DESTDIR="$TENV_ROOT" install
mkdir -p "$TENV_ROOT/sbin/"
cp "$top_builddir/test/common/serv" "$TENV_ROOT/sbin/" cp "$top_builddir/test/common/serv" "$TENV_ROOT/sbin/"
# shellcheck disable=SC2154 # shellcheck disable=SC2154
+1 -2
View File
@@ -1,2 +1 @@
EXTRA_DIST = lib.sh exec.sh start.sh root.mk busybox-x86_64.md5 EXTRA_DIST = lib.sh exec.sh start.sh root.mk
EXTRA_DIST += chrootsetup.sh
+2 -1
View File
@@ -46,6 +46,7 @@ all: $(libs) $(DEST)/bin/$(BBBIN)
$(DEST)/bin/$(BBBIN).md5: $(DEST)/bin/$(BBBIN).md5:
@mkdir -p $(DEST) @mkdir -p $(DEST)
@cp -a $(SKEL)/* $(DEST)/ @cp -a $(SKEL)/* $(DEST)/
@chmod -R u+w $(DEST)/
@find $(DEST) -name .empty -delete @find $(DEST) -name .empty -delete
$(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5 $(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5
@@ -71,6 +72,6 @@ $(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5
fi) fi)
@chmod +x $@ @chmod +x $@
$(libs): $(libs): $(DEST)/bin/$(BBBIN).md5
mkdir -p $(dir $@) mkdir -p $(dir $@)
cp $(patsubst $(abspath $(DEST))%,%,$@) $@ cp $(patsubst $(abspath $(DEST))%,%,$@) $@