# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1660168718 -7200
# Node ID 8306354f755bee52685282c9dfd33d3090ffcb6a
# Parent  77fbb52e0a14015a9b0987488d876db54f3a677a
Adopted the name "Departure" and renamed various programs. The "dstest" naming
is retained for test programs. Added some rudimentary documentation.

diff -r 77fbb52e0a14 -r 8306354f755b README.txt
--- a/README.txt	Wed Aug 10 00:25:44 2022 +0200
+++ b/README.txt	Wed Aug 10 23:58:38 2022 +0200
@@ -1,21 +1,92 @@
+Departure
+=========
+
 This is a collection of L4Re packages for providing and using filesystems and
 related components.
 
-This directory (dstest) should be installed within the pkg directory in the
+This directory (departure) should be installed within the pkg directory in the
 L4Re distribution.
 
+Building Fiasco and L4Re
+------------------------
+
+Although this is generally documented, the concise instructions for building
+the software have not been preserved in the L4Re distribution, requiring the
+perusal of online resources. For example:
+
+https://github.com/kernkonzept/manifest/wiki/BUILDING
+
+Some reminders are provided below to save the reader the bother of looking up
+or searching for this information, particularly if it does not continue to
+reside in the above location.
+
+First of all, the ham tool has to be obtained. This can be done as follows:
+
+git clone https://github.com/kernkonzept/ham.git
+
+It can be built as follows:
+
+cd ham
+make
+
+Returning to the parent directory, the Fiasco and L4Re distributions can be
+obtained as follows:
+
+ham/ham init -u https://github.com/kernkonzept/manifest.git
+ham/ham sync
+
+(Referencing ham within its repository avoids any need to put the program on
+the PATH, which is largely unnecessary since we will only be using it in this
+particular location and for the specific purpose of downloading the remaining
+software of interest.)
+
+Here is a quick summary of the build process for Fiasco starting at the parent
+directory of the Fiasco and L4Re distributions:
+
+cd fiasco
+make BUILDDIR=mybuild
+cd mybuild
+make config
+make
+
+The final make command can employ flags such as "-j8" or even "-j" without any
+parameter to parallelise the build.
+
+At this point, this directory (departure) can be copied into the L4Re
+distribution within the pkg directory.
+
+Here is a quick summary of the build process for L4Re, also starting at the
+parent directory of the Fiasco and L4Re distributions:
+
+cd l4
+make B=mybuild
+make O=mybuild config
+make O=mybuild
+
+Again, the final make command can employ parallelisation flags. For example:
+
+make -j8 O=mybuild
+
+Along with the usual L4Re software, this will also build the software provided
+by this distribution if it has been copied into the pkg/departure location
+within the l4 directory.
+
+Running Programs from this Distribution
+---------------------------------------
+
 To make the test programs available to L4Re, add the following line to the
 L4Re conf/Makeconf.boot file:
 
-MODULE_SEARCH_PATH += $(L4DIR_ABS)/pkg/dstest/conf
+MODULE_SEARCH_PATH += $(L4DIR_ABS)/pkg/departure/conf
 
 It may also be necessary to add the following line as well:
 
-BOOTSTRAP_SEARCH_PATH += $(L4DIR_ABS)/pkg/dstest/conf
+BOOTSTRAP_SEARCH_PATH += $(L4DIR_ABS)/pkg/departure/conf
 
 This removes any need to copy program configuration files and associated
 resources to the L4Re distribution itself.
 
 The program module lists in the conf subdirectory can either be appended to
 the L4Re conf/modules.list file, or a specific .list file can be copied to the
-conf/modules.list location (potentially after taking a backup copy).
+conf/modules.list location (potentially after taking a backup copy of the
+original file).
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_block.cfg
--- a/conf/dstest_block.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_block.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "server", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 l:startv({
     caps = {
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_block.list
--- a/conf/dstest_block.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_block.list	Wed Aug 10 23:58:38 2022 +0200
@@ -4,7 +4,7 @@
 module l4re
 module ned
 module dstest_block_client
-module dstest_block_server
+module block_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_block_simple.cfg
--- a/conf/dstest_block_simple.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_block_simple.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "server", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 l:startv({
     caps = {
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_block_simple.list
--- a/conf/dstest_block_simple.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_block_simple.list	Wed Aug 10 23:58:38 2022 +0200
@@ -4,7 +4,7 @@
 module l4re
 module ned
 module dstest_block_client_simple
-module dstest_block_server
+module block_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_exec.cfg
--- a/conf/dstest_exec.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_exec.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "pipes", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 local block_server = l:new_channel();
 
@@ -22,7 +22,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -34,7 +34,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "20", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "20", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_exec.list
--- a/conf/dstest_exec.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_exec.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,9 +5,9 @@
 module l4re
 module ned
 module dstest_exec
-module dstest_ext2_server
-module dstest_block_server
-module dstest_pipe_server
+module ext2_server
+module block_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_ext2.cfg
--- a/conf/dstest_ext2.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_ext2.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -23,7 +23,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_ext2.list
--- a/conf/dstest_ext2.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_ext2.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,8 +5,8 @@
 module l4re
 module ned
 module dstest_block_client_simple
-module dstest_block_server
-module dstest_ext2_server
+module block_server
+module ext2_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_ext2fs.cfg
--- a/conf/dstest_ext2fs.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_ext2fs.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 l:startv({
     caps = {
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_ext2fs.list
--- a/conf/dstest_ext2fs.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_ext2fs.list	Wed Aug 10 23:58:38 2022 +0200
@@ -4,7 +4,7 @@
 module e2test.fs
 module l4re
 module ned
-module dstest_block_server
+module block_server
 module dstest_ext2fs_client
 module lib4re-c.so
 module lib4re-c-util.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file.cfg
--- a/conf/dstest_file.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -23,7 +23,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file.list
--- a/conf/dstest_file.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,8 +5,8 @@
 module l4re
 module ned
 module dstest_file_client
-module dstest_ext2_server
-module dstest_block_server
+module ext2_server
+module block_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_access.cfg
--- a/conf/dstest_file_access.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_access.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "pipes", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 local blocksvr = l:new_channel();
 
@@ -22,7 +22,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -34,7 +34,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_access.list
--- a/conf/dstest_file_access.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_access.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,9 +5,9 @@
 module l4re
 module ned
 module dstest_file_access
-module dstest_ext2_server
-module dstest_block_server
-module dstest_pipe_server
+module ext2_server
+module block_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_mapping.cfg
--- a/conf/dstest_file_mapping.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_mapping.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "server", "r" },
   },
-  "rom/dstest_host_server", "10");
+  "rom/host_server", "10");
 
 l:startv({
     caps = {
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_mapping.list
--- a/conf/dstest_file_mapping.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_mapping.list	Wed Aug 10 23:58:38 2022 +0200
@@ -4,7 +4,7 @@
 module l4re
 module ned
 module dstest_file_mapping
-module dstest_host_server
+module host_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_monitor.cfg
--- a/conf/dstest_file_monitor.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_monitor.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -23,7 +23,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_monitor.list
--- a/conf/dstest_file_monitor.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_monitor.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,8 +5,8 @@
 module l4re
 module ned
 module dstest_file_monitor
-module dstest_ext2_server
-module dstest_block_server
+module ext2_server
+module block_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_readdir.cfg
--- a/conf/dstest_file_readdir.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_readdir.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "pipes", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 local block_server = l:new_channel();
 
@@ -22,7 +22,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -34,7 +34,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_readdir.list
--- a/conf/dstest_file_readdir.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_readdir.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,9 +5,9 @@
 module l4re
 module ned
 module dstest_file_readdir
-module dstest_ext2_server
-module dstest_block_server
-module dstest_pipe_server
+module ext2_server
+module block_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_readdir_concurrent.cfg
--- a/conf/dstest_file_readdir_concurrent.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_readdir_concurrent.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "pipes", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 local block_server = l:new_channel();
 
@@ -22,7 +22,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -34,7 +34,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_readdir_concurrent.list
--- a/conf/dstest_file_readdir_concurrent.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_readdir_concurrent.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,9 +5,9 @@
 module l4re
 module ned
 module dstest_file_readdir_concurrent
-module dstest_ext2_server
-module dstest_block_server
-module dstest_pipe_server
+module ext2_server
+module block_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_remove.cfg
--- a/conf/dstest_file_remove.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_remove.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "pipes", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 local block_server = l:new_channel();
 
@@ -22,7 +22,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -34,7 +34,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_remove.list
--- a/conf/dstest_file_remove.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_remove.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,9 +5,9 @@
 module l4re
 module ned
 module dstest_file_remove
-module dstest_ext2_server
-module dstest_block_server
-module dstest_pipe_server
+module ext2_server
+module block_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_rename.cfg
--- a/conf/dstest_file_rename.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_rename.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "pipes", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 local block_server = l:new_channel();
 
@@ -22,7 +22,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -34,7 +34,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_file_rename.list
--- a/conf/dstest_file_rename.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_file_rename.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,9 +5,9 @@
 module l4re
 module ned
 module dstest_file_rename
-module dstest_ext2_server
-module dstest_block_server
-module dstest_pipe_server
+module ext2_server
+module block_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_fsaccess.cfg
--- a/conf/dstest_fsaccess.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_fsaccess.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "pipes", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 local block_server = l:new_channel();
 
@@ -22,7 +22,7 @@
     },
     log = { "blocksvr", "r" },
   },
-  "rom/dstest_block_server", "10");
+  "rom/block_server", "10");
 
 local ext2svr = l:new_channel();
 
@@ -34,7 +34,7 @@
     },
     log = { "ext2svr", "y" },
   },
-  "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
+  "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr");
 
 -- Obtain user filesystems with umask 0022 (18).
 
@@ -48,4 +48,4 @@
     log = { "client", "g" },
   },
   -- program, options, operation involving a script file
-  "rom/dstest_fsaccess", "-m", "0022", "script", "rom/fsaccess.txt");
+  "rom/fsaccess", "-m", "0022", "script", "rom/fsaccess.txt");
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_fsaccess.list
--- a/conf/dstest_fsaccess.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_fsaccess.list	Wed Aug 10 23:58:38 2022 +0200
@@ -5,10 +5,10 @@
 module fsaccess.txt
 module l4re
 module ned
-module dstest_fsaccess
-module dstest_ext2_server
-module dstest_block_server
-module dstest_pipe_server
+module fsaccess
+module ext2_server
+module block_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_host.cfg
--- a/conf/dstest_host.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_host.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "server", "r" },
   },
-  "rom/dstest_host_server", "10");
+  "rom/host_server", "10");
 
 l:startv({
     caps = {
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_host.list
--- a/conf/dstest_host.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_host.list	Wed Aug 10 23:58:38 2022 +0200
@@ -4,7 +4,7 @@
 module l4re
 module ned
 module dstest_host_client
-module dstest_host_server
+module host_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_host_readdir.cfg
--- a/conf/dstest_host_readdir.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_host_readdir.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "pipes", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 local host_server = l:new_channel();
 
@@ -23,7 +23,7 @@
     },
     log = { "server", "r" },
   },
-  "rom/dstest_host_server", "10");
+  "rom/host_server", "10");
 
 l:startv({
     caps = {
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_host_readdir.list
--- a/conf/dstest_host_readdir.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_host_readdir.list	Wed Aug 10 23:58:38 2022 +0200
@@ -4,8 +4,8 @@
 module l4re
 module ned
 module dstest_file_readdir
-module dstest_host_server
-module dstest_pipe_server
+module host_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_pipe.cfg
--- a/conf/dstest_pipe.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_pipe.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "server", "r" },
   },
-  "rom/dstest_pipe_server", "10");
+  "rom/pipe_server", "10");
 
 l:start({
     caps = {
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_pipe.list
--- a/conf/dstest_pipe.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_pipe.list	Wed Aug 10 23:58:38 2022 +0200
@@ -4,7 +4,7 @@
 module l4re
 module ned
 module dstest_pipe_client
-module dstest_pipe_server
+module pipe_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_test.cfg
--- a/conf/dstest_test.cfg	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_test.cfg	Wed Aug 10 23:58:38 2022 +0200
@@ -12,7 +12,7 @@
     },
     log = { "server", "r" },
   },
-  "rom/dstest_test_server", "40");
+  "rom/test_server", "40");
 
 l:start({
     caps = {
diff -r 77fbb52e0a14 -r 8306354f755b conf/dstest_test.list
--- a/conf/dstest_test.list	Wed Aug 10 00:25:44 2022 +0200
+++ b/conf/dstest_test.list	Wed Aug 10 23:58:38 2022 +0200
@@ -4,7 +4,7 @@
 module l4re
 module ned
 module dstest_test_client
-module dstest_test_server
+module test_server
 module lib4re-c.so
 module lib4re-c-util.so
 module lib4re.so
diff -r 77fbb52e0a14 -r 8306354f755b fsaccess/Makefile
--- a/fsaccess/Makefile	Wed Aug 10 00:25:44 2022 +0200
+++ b/fsaccess/Makefile	Wed Aug 10 23:58:38 2022 +0200
@@ -1,7 +1,7 @@
 PKGDIR		?= .
 L4DIR		?= $(PKGDIR)/../../..
 
-TARGET		= dstest_fsaccess
+TARGET		= fsaccess
 
 MODE            = static
 
diff -r 77fbb52e0a14 -r 8306354f755b servers/Makefile
--- a/servers/Makefile	Wed Aug 10 00:25:44 2022 +0200
+++ b/servers/Makefile	Wed Aug 10 23:58:38 2022 +0200
@@ -2,23 +2,23 @@
 L4DIR		?= $(PKGDIR)/../../..
 
 TARGET		= \
-		dstest_block_server \
-		dstest_ext2_server \
-		dstest_host_server \
-		dstest_pipe_server \
-		dstest_test_server
+		block_server \
+		ext2_server \
+		host_server \
+		pipe_server \
+		test_server
 
 MODE            = static
 
-SRC_CC_dstest_block_server	= block_file_server.cc
+SRC_CC_block_server	= block_file_server.cc
 
-SRC_CC_dstest_ext2_server	= ext2_file_server.cc
+SRC_CC_ext2_server	= ext2_file_server.cc
 
-SRC_CC_dstest_host_server	= host_file_server.cc
+SRC_CC_host_server	= host_file_server.cc
 
-SRC_CC_dstest_pipe_server	= pipe_server.cc
+SRC_CC_pipe_server	= pipe_server.cc
 
-SRC_CC_dstest_test_server	= test_file_server.cc
+SRC_CC_test_server	= test_file_server.cc
 
 REQUIRES_LIBS	= l4re_c-util libmem libfsserver libipc libstdc++ libsystypes libe2access_blockserver
 
diff -r 77fbb52e0a14 -r 8306354f755b test_files/programs/Makefile
--- a/test_files/programs/Makefile	Wed Aug 10 00:25:44 2022 +0200
+++ b/test_files/programs/Makefile	Wed Aug 10 23:58:38 2022 +0200
@@ -5,7 +5,7 @@
 
 MODE            = static
 
-SRC_C_dstest_exec_payload	= exec_payload.c
+SRC_C_dstest_exec_payload	= dstest_exec_payload.c
 
 REQUIRES_LIBS	= libc
 
diff -r 77fbb52e0a14 -r 8306354f755b test_files/programs/dstest_exec_payload.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test_files/programs/dstest_exec_payload.c	Wed Aug 10 23:58:38 2022 +0200
@@ -0,0 +1,39 @@
+/*
+ * A test of executing code in a new task.
+ *
+ * Copyright (C) 2022 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
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA
+ */
+
+#include <stdio.h>
+
+
+
+int main(int argc, char *argv[])
+{
+  int i;
+
+  printf("Hello from %s (%d)!\n", argc > 0 ? argv[0] : "exec_payload.c", argc);
+
+  for (i = 0; i < argc; i++)
+    printf("Arg #%d: %s\n", i, argv[i]);
+
+  return 0;
+}
+
+/* vim: tabstop=2 expandtab shiftwidth=2
+*/
diff -r 77fbb52e0a14 -r 8306354f755b test_files/programs/exec_payload.c
--- a/test_files/programs/exec_payload.c	Wed Aug 10 00:25:44 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * A test of executing code in a new task.
- *
- * Copyright (C) 2022 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
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA
- */
-
-#include <stdio.h>
-
-
-
-int main(int argc, char *argv[])
-{
-  int i;
-
-  printf("Hello from %s (%d)!\n", argc > 0 ? argv[0] : "exec_payload.c", argc);
-
-  for (i = 0; i < argc; i++)
-    printf("Arg #%d: %s\n", i, argv[i]);
-
-  return 0;
-}
-
-/* vim: tabstop=2 expandtab shiftwidth=2
-*/