wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-02 05:52:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2022-04-09 17:52:48 +02:00
parent a39d958d25
commit 377c8bce8c
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile.am
+13 -13
View File
@@ -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
test/setup-root.sh
+2
View File
@@ -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
test/tenv/Makefile.am
+1 -2
View File
@@ -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
test/tenv/root.mk
+2 -1
View File
@@ -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))%,%,$@) $@