# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1705514165 -3600
# Node ID e3d2ac731e491fbbd0bc6ad3a74f452d788a030b
# Parent  4bab35f8678915d042e9df6c7d717d704e2ba9c0
Moved filesystem-resident programs into the bin directory.

diff -r 4bab35f86789 -r e3d2ac731e49 conf/dstest_exec.cfg
--- a/conf/dstest_exec.cfg	Wed Jan 17 00:53:24 2024 +0100
+++ b/conf/dstest_exec.cfg	Wed Jan 17 18:56:05 2024 +0100
@@ -54,7 +54,7 @@
     },
     log = { "process", "y" },
   },
-  "rom/process_server", "home/paulb/exec_region_mapper");
+  "rom/process_server", "bin/exec_region_mapper");
 
 l:startv({
     caps = {
@@ -64,4 +64,4 @@
     },
     log = { "client", "g" },
   },
-  "rom/dstest_exec", "home/paulb/dstest_exec_payload", "home/paulb/LICENCE.txt", "21");
+  "rom/dstest_exec", "bin/dstest_exec_payload", "home/paulb/LICENCE.txt", "21");
diff -r 4bab35f86789 -r e3d2ac731e49 conf/dstest_exec_many.cfg
--- a/conf/dstest_exec_many.cfg	Wed Jan 17 00:53:24 2024 +0100
+++ b/conf/dstest_exec_many.cfg	Wed Jan 17 18:56:05 2024 +0100
@@ -54,7 +54,7 @@
     },
     log = { "process", "y" },
   },
-  "rom/process_server", "home/paulb/exec_region_mapper");
+  "rom/process_server", "bin/exec_region_mapper");
 
 l:startv({
     caps = {
@@ -63,4 +63,4 @@
     },
     log = { "client", "g" },
   },
-  "rom/dstest_exec_many", "20", "home/paulb/clip", "home/paulb/LICENCE.txt", "21", "1");
+  "rom/dstest_exec_many", "20", "bin/clip", "home/paulb/LICENCE.txt", "21", "1");
diff -r 4bab35f86789 -r e3d2ac731e49 conf/dstest_fsaccess.cfg
--- a/conf/dstest_fsaccess.cfg	Wed Jan 17 00:53:24 2024 +0100
+++ b/conf/dstest_fsaccess.cfg	Wed Jan 17 18:56:05 2024 +0100
@@ -54,7 +54,7 @@
     },
     log = { "process", "y" },
   },
-  "rom/process_server", "home/paulb/exec_region_mapper");
+  "rom/process_server", "bin/exec_region_mapper");
 
 l:startv({
     caps = {
diff -r 4bab35f86789 -r e3d2ac731e49 conf/dstest_fsaccess_stdin.cfg
--- a/conf/dstest_fsaccess_stdin.cfg	Wed Jan 17 00:53:24 2024 +0100
+++ b/conf/dstest_fsaccess_stdin.cfg	Wed Jan 17 18:56:05 2024 +0100
@@ -54,7 +54,7 @@
     },
     log = { "process", "y" },
   },
-  "rom/process_server", "home/paulb/exec_region_mapper");
+  "rom/process_server", "bin/exec_region_mapper");
 
 l:startv({
     log = L4.Env.log,
diff -r 4bab35f86789 -r e3d2ac731e49 test_files/Makefile
--- a/test_files/Makefile	Wed Jan 17 00:53:24 2024 +0100
+++ b/test_files/Makefile	Wed Jan 17 18:56:05 2024 +0100
@@ -15,6 +15,8 @@
 
 L4_SYSTEM	= $(BUILD_ARCH)_$(CPU)
 
+FS_SCRIPT	= $(PKGDIR)/mk_e2test.sh
+
 PROGRAMS_DIR	= $(PKGDIR_OBJ)/programs/OBJ-$(L4_SYSTEM)-l4f
 PROGRAMS	= $(foreach PROGRAM,$(wildcard $(PROGRAMS_DIR)/*),$(if $(shell test -x $(PROGRAM) && echo "Y"),$(PROGRAM),))
 
@@ -26,9 +28,9 @@
 
 all:: $(TARGET) $(PROGRAMS_DIR)
 
-$(TARGET): $(PROGRAMS_DIR) $(RM_PROGRAM)
+$(TARGET): $(PROGRAMS_DIR) $(RM_PROGRAM) $(FS_SCRIPT)
 	$(MAKE) -C $(E2ACCESS_DIR) && \
-	$(PKGDIR)/mk_e2test.sh -q $(PKGDIR) $(E2ACCESS_DIR) $@ \
+	$(FS_SCRIPT) -q $(PKGDIR) $(E2ACCESS_DIR) $@ \
 		$(PROGRAMS) \
 		$(RM_PROGRAM)
 
diff -r 4bab35f86789 -r e3d2ac731e49 test_files/mk_e2test.sh
--- a/test_files/mk_e2test.sh	Wed Jan 17 00:53:24 2024 +0100
+++ b/test_files/mk_e2test.sh	Wed Jan 17 18:56:05 2024 +0100
@@ -2,7 +2,7 @@
 
 # Make a test filesystem.
 #
-# Copyright (C) 2021, 2022 Paul Boddie <paul@boddie.org.uk>
+# Copyright (C) 2021, 2022, 2024 Paul Boddie <paul@boddie.org.uk>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -114,20 +114,24 @@
 
 cp "$PKGDIR/../docs/LICENCE.txt" .
 
-# Put some programs in the same place.
+# Return to the top level.
+
+cd ../..
+
+# Create a top-level bin directory.
+
+mkdir bin
+
+# Put some programs in the bin directory.
 
 for PROGRAM in $* ; do
-    cp $(realpath "$PROGRAM") .
+    cp $(realpath "$PROGRAM") bin
 done
 
-# Leave the filesystem root.
-
-cd ../..
-
 # Create a filesystem image.
 
 EXTRA=2000
-SIZE=$(du -s -k home | cut -f 1)
+SIZE=$(du -s -k . | cut -f 1)
 TOTAL=$(($SIZE + $EXTRA))
 
 dd if=/dev/zero of="$TARGET" bs=1024 count=$TOTAL
@@ -138,7 +142,7 @@
 
 # Add the directories and files to the image.
 
-for DIR in home/paulb home/paulb/private home/paulb/public home/paulb/shared home/paulb/many ; do
+for DIR in bin home/paulb home/paulb/private home/paulb/public home/paulb/shared home/paulb/many ; do
     e2access mkdir "$DIR"
     e2access copy-in $(find "$DIR" -maxdepth 1 -type f | sort) "$DIR"
 done
@@ -149,6 +153,7 @@
 
 if [ ! "$QUIET" ] ; then
     e2access ls ''
+    e2access ls 'bin'
     e2access ls 'home'
     e2access ls 'home/paulb'
     e2access ls 'home/paulb/many'