1.1 --- a/README.txt Wed Aug 10 00:25:44 2022 +0200 1.2 +++ b/README.txt Wed Aug 10 23:58:38 2022 +0200 1.3 @@ -1,21 +1,92 @@ 1.4 +Departure 1.5 +========= 1.6 + 1.7 This is a collection of L4Re packages for providing and using filesystems and 1.8 related components. 1.9 1.10 -This directory (dstest) should be installed within the pkg directory in the 1.11 +This directory (departure) should be installed within the pkg directory in the 1.12 L4Re distribution. 1.13 1.14 +Building Fiasco and L4Re 1.15 +------------------------ 1.16 + 1.17 +Although this is generally documented, the concise instructions for building 1.18 +the software have not been preserved in the L4Re distribution, requiring the 1.19 +perusal of online resources. For example: 1.20 + 1.21 +https://github.com/kernkonzept/manifest/wiki/BUILDING 1.22 + 1.23 +Some reminders are provided below to save the reader the bother of looking up 1.24 +or searching for this information, particularly if it does not continue to 1.25 +reside in the above location. 1.26 + 1.27 +First of all, the ham tool has to be obtained. This can be done as follows: 1.28 + 1.29 +git clone https://github.com/kernkonzept/ham.git 1.30 + 1.31 +It can be built as follows: 1.32 + 1.33 +cd ham 1.34 +make 1.35 + 1.36 +Returning to the parent directory, the Fiasco and L4Re distributions can be 1.37 +obtained as follows: 1.38 + 1.39 +ham/ham init -u https://github.com/kernkonzept/manifest.git 1.40 +ham/ham sync 1.41 + 1.42 +(Referencing ham within its repository avoids any need to put the program on 1.43 +the PATH, which is largely unnecessary since we will only be using it in this 1.44 +particular location and for the specific purpose of downloading the remaining 1.45 +software of interest.) 1.46 + 1.47 +Here is a quick summary of the build process for Fiasco starting at the parent 1.48 +directory of the Fiasco and L4Re distributions: 1.49 + 1.50 +cd fiasco 1.51 +make BUILDDIR=mybuild 1.52 +cd mybuild 1.53 +make config 1.54 +make 1.55 + 1.56 +The final make command can employ flags such as "-j8" or even "-j" without any 1.57 +parameter to parallelise the build. 1.58 + 1.59 +At this point, this directory (departure) can be copied into the L4Re 1.60 +distribution within the pkg directory. 1.61 + 1.62 +Here is a quick summary of the build process for L4Re, also starting at the 1.63 +parent directory of the Fiasco and L4Re distributions: 1.64 + 1.65 +cd l4 1.66 +make B=mybuild 1.67 +make O=mybuild config 1.68 +make O=mybuild 1.69 + 1.70 +Again, the final make command can employ parallelisation flags. For example: 1.71 + 1.72 +make -j8 O=mybuild 1.73 + 1.74 +Along with the usual L4Re software, this will also build the software provided 1.75 +by this distribution if it has been copied into the pkg/departure location 1.76 +within the l4 directory. 1.77 + 1.78 +Running Programs from this Distribution 1.79 +--------------------------------------- 1.80 + 1.81 To make the test programs available to L4Re, add the following line to the 1.82 L4Re conf/Makeconf.boot file: 1.83 1.84 -MODULE_SEARCH_PATH += $(L4DIR_ABS)/pkg/dstest/conf 1.85 +MODULE_SEARCH_PATH += $(L4DIR_ABS)/pkg/departure/conf 1.86 1.87 It may also be necessary to add the following line as well: 1.88 1.89 -BOOTSTRAP_SEARCH_PATH += $(L4DIR_ABS)/pkg/dstest/conf 1.90 +BOOTSTRAP_SEARCH_PATH += $(L4DIR_ABS)/pkg/departure/conf 1.91 1.92 This removes any need to copy program configuration files and associated 1.93 resources to the L4Re distribution itself. 1.94 1.95 The program module lists in the conf subdirectory can either be appended to 1.96 the L4Re conf/modules.list file, or a specific .list file can be copied to the 1.97 -conf/modules.list location (potentially after taking a backup copy). 1.98 +conf/modules.list location (potentially after taking a backup copy of the 1.99 +original file).
2.1 --- a/conf/dstest_block.cfg Wed Aug 10 00:25:44 2022 +0200 2.2 +++ b/conf/dstest_block.cfg Wed Aug 10 23:58:38 2022 +0200 2.3 @@ -12,7 +12,7 @@ 2.4 }, 2.5 log = { "server", "r" }, 2.6 }, 2.7 - "rom/dstest_block_server", "10"); 2.8 + "rom/block_server", "10"); 2.9 2.10 l:startv({ 2.11 caps = {
3.1 --- a/conf/dstest_block.list Wed Aug 10 00:25:44 2022 +0200 3.2 +++ b/conf/dstest_block.list Wed Aug 10 23:58:38 2022 +0200 3.3 @@ -4,7 +4,7 @@ 3.4 module l4re 3.5 module ned 3.6 module dstest_block_client 3.7 -module dstest_block_server 3.8 +module block_server 3.9 module lib4re-c.so 3.10 module lib4re-c-util.so 3.11 module lib4re.so
4.1 --- a/conf/dstest_block_simple.cfg Wed Aug 10 00:25:44 2022 +0200 4.2 +++ b/conf/dstest_block_simple.cfg Wed Aug 10 23:58:38 2022 +0200 4.3 @@ -12,7 +12,7 @@ 4.4 }, 4.5 log = { "server", "r" }, 4.6 }, 4.7 - "rom/dstest_block_server", "10"); 4.8 + "rom/block_server", "10"); 4.9 4.10 l:startv({ 4.11 caps = {
5.1 --- a/conf/dstest_block_simple.list Wed Aug 10 00:25:44 2022 +0200 5.2 +++ b/conf/dstest_block_simple.list Wed Aug 10 23:58:38 2022 +0200 5.3 @@ -4,7 +4,7 @@ 5.4 module l4re 5.5 module ned 5.6 module dstest_block_client_simple 5.7 -module dstest_block_server 5.8 +module block_server 5.9 module lib4re-c.so 5.10 module lib4re-c-util.so 5.11 module lib4re.so
6.1 --- a/conf/dstest_exec.cfg Wed Aug 10 00:25:44 2022 +0200 6.2 +++ b/conf/dstest_exec.cfg Wed Aug 10 23:58:38 2022 +0200 6.3 @@ -12,7 +12,7 @@ 6.4 }, 6.5 log = { "pipes", "r" }, 6.6 }, 6.7 - "rom/dstest_pipe_server", "10"); 6.8 + "rom/pipe_server", "10"); 6.9 6.10 local block_server = l:new_channel(); 6.11 6.12 @@ -22,7 +22,7 @@ 6.13 }, 6.14 log = { "blocksvr", "r" }, 6.15 }, 6.16 - "rom/dstest_block_server", "10"); 6.17 + "rom/block_server", "10"); 6.18 6.19 local ext2svr = l:new_channel(); 6.20 6.21 @@ -34,7 +34,7 @@ 6.22 }, 6.23 log = { "ext2svr", "y" }, 6.24 }, 6.25 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "20", "ext2svr"); 6.26 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "20", "ext2svr"); 6.27 6.28 -- Obtain user filesystems with umask 0022 (18). 6.29
7.1 --- a/conf/dstest_exec.list Wed Aug 10 00:25:44 2022 +0200 7.2 +++ b/conf/dstest_exec.list Wed Aug 10 23:58:38 2022 +0200 7.3 @@ -5,9 +5,9 @@ 7.4 module l4re 7.5 module ned 7.6 module dstest_exec 7.7 -module dstest_ext2_server 7.8 -module dstest_block_server 7.9 -module dstest_pipe_server 7.10 +module ext2_server 7.11 +module block_server 7.12 +module pipe_server 7.13 module lib4re-c.so 7.14 module lib4re-c-util.so 7.15 module lib4re.so
8.1 --- a/conf/dstest_ext2.cfg Wed Aug 10 00:25:44 2022 +0200 8.2 +++ b/conf/dstest_ext2.cfg Wed Aug 10 23:58:38 2022 +0200 8.3 @@ -12,7 +12,7 @@ 8.4 }, 8.5 log = { "blocksvr", "r" }, 8.6 }, 8.7 - "rom/dstest_block_server", "10"); 8.8 + "rom/block_server", "10"); 8.9 8.10 local ext2svr = l:new_channel(); 8.11 8.12 @@ -23,7 +23,7 @@ 8.13 }, 8.14 log = { "ext2svr", "y" }, 8.15 }, 8.16 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 8.17 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 8.18 8.19 -- Obtain user filesystems with umask 0022 (18). 8.20
9.1 --- a/conf/dstest_ext2.list Wed Aug 10 00:25:44 2022 +0200 9.2 +++ b/conf/dstest_ext2.list Wed Aug 10 23:58:38 2022 +0200 9.3 @@ -5,8 +5,8 @@ 9.4 module l4re 9.5 module ned 9.6 module dstest_block_client_simple 9.7 -module dstest_block_server 9.8 -module dstest_ext2_server 9.9 +module block_server 9.10 +module ext2_server 9.11 module lib4re-c.so 9.12 module lib4re-c-util.so 9.13 module lib4re.so
10.1 --- a/conf/dstest_ext2fs.cfg Wed Aug 10 00:25:44 2022 +0200 10.2 +++ b/conf/dstest_ext2fs.cfg Wed Aug 10 23:58:38 2022 +0200 10.3 @@ -12,7 +12,7 @@ 10.4 }, 10.5 log = { "blocksvr", "r" }, 10.6 }, 10.7 - "rom/dstest_block_server", "10"); 10.8 + "rom/block_server", "10"); 10.9 10.10 l:startv({ 10.11 caps = {
11.1 --- a/conf/dstest_ext2fs.list Wed Aug 10 00:25:44 2022 +0200 11.2 +++ b/conf/dstest_ext2fs.list Wed Aug 10 23:58:38 2022 +0200 11.3 @@ -4,7 +4,7 @@ 11.4 module e2test.fs 11.5 module l4re 11.6 module ned 11.7 -module dstest_block_server 11.8 +module block_server 11.9 module dstest_ext2fs_client 11.10 module lib4re-c.so 11.11 module lib4re-c-util.so
12.1 --- a/conf/dstest_file.cfg Wed Aug 10 00:25:44 2022 +0200 12.2 +++ b/conf/dstest_file.cfg Wed Aug 10 23:58:38 2022 +0200 12.3 @@ -12,7 +12,7 @@ 12.4 }, 12.5 log = { "blocksvr", "r" }, 12.6 }, 12.7 - "rom/dstest_block_server", "10"); 12.8 + "rom/block_server", "10"); 12.9 12.10 local ext2svr = l:new_channel(); 12.11 12.12 @@ -23,7 +23,7 @@ 12.13 }, 12.14 log = { "ext2svr", "y" }, 12.15 }, 12.16 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 12.17 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 12.18 12.19 -- Obtain user filesystems with umask 0022 (18). 12.20
13.1 --- a/conf/dstest_file.list Wed Aug 10 00:25:44 2022 +0200 13.2 +++ b/conf/dstest_file.list Wed Aug 10 23:58:38 2022 +0200 13.3 @@ -5,8 +5,8 @@ 13.4 module l4re 13.5 module ned 13.6 module dstest_file_client 13.7 -module dstest_ext2_server 13.8 -module dstest_block_server 13.9 +module ext2_server 13.10 +module block_server 13.11 module lib4re-c.so 13.12 module lib4re-c-util.so 13.13 module lib4re.so
14.1 --- a/conf/dstest_file_access.cfg Wed Aug 10 00:25:44 2022 +0200 14.2 +++ b/conf/dstest_file_access.cfg Wed Aug 10 23:58:38 2022 +0200 14.3 @@ -12,7 +12,7 @@ 14.4 }, 14.5 log = { "pipes", "r" }, 14.6 }, 14.7 - "rom/dstest_pipe_server", "10"); 14.8 + "rom/pipe_server", "10"); 14.9 14.10 local blocksvr = l:new_channel(); 14.11 14.12 @@ -22,7 +22,7 @@ 14.13 }, 14.14 log = { "blocksvr", "r" }, 14.15 }, 14.16 - "rom/dstest_block_server", "10"); 14.17 + "rom/block_server", "10"); 14.18 14.19 local ext2svr = l:new_channel(); 14.20 14.21 @@ -34,7 +34,7 @@ 14.22 }, 14.23 log = { "ext2svr", "y" }, 14.24 }, 14.25 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 14.26 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 14.27 14.28 -- Obtain user filesystems with umask 0022 (18). 14.29
15.1 --- a/conf/dstest_file_access.list Wed Aug 10 00:25:44 2022 +0200 15.2 +++ b/conf/dstest_file_access.list Wed Aug 10 23:58:38 2022 +0200 15.3 @@ -5,9 +5,9 @@ 15.4 module l4re 15.5 module ned 15.6 module dstest_file_access 15.7 -module dstest_ext2_server 15.8 -module dstest_block_server 15.9 -module dstest_pipe_server 15.10 +module ext2_server 15.11 +module block_server 15.12 +module pipe_server 15.13 module lib4re-c.so 15.14 module lib4re-c-util.so 15.15 module lib4re.so
16.1 --- a/conf/dstest_file_mapping.cfg Wed Aug 10 00:25:44 2022 +0200 16.2 +++ b/conf/dstest_file_mapping.cfg Wed Aug 10 23:58:38 2022 +0200 16.3 @@ -12,7 +12,7 @@ 16.4 }, 16.5 log = { "server", "r" }, 16.6 }, 16.7 - "rom/dstest_host_server", "10"); 16.8 + "rom/host_server", "10"); 16.9 16.10 l:startv({ 16.11 caps = {
17.1 --- a/conf/dstest_file_mapping.list Wed Aug 10 00:25:44 2022 +0200 17.2 +++ b/conf/dstest_file_mapping.list Wed Aug 10 23:58:38 2022 +0200 17.3 @@ -4,7 +4,7 @@ 17.4 module l4re 17.5 module ned 17.6 module dstest_file_mapping 17.7 -module dstest_host_server 17.8 +module host_server 17.9 module lib4re-c.so 17.10 module lib4re-c-util.so 17.11 module lib4re.so
18.1 --- a/conf/dstest_file_monitor.cfg Wed Aug 10 00:25:44 2022 +0200 18.2 +++ b/conf/dstest_file_monitor.cfg Wed Aug 10 23:58:38 2022 +0200 18.3 @@ -12,7 +12,7 @@ 18.4 }, 18.5 log = { "blocksvr", "r" }, 18.6 }, 18.7 - "rom/dstest_block_server", "10"); 18.8 + "rom/block_server", "10"); 18.9 18.10 local ext2svr = l:new_channel(); 18.11 18.12 @@ -23,7 +23,7 @@ 18.13 }, 18.14 log = { "ext2svr", "y" }, 18.15 }, 18.16 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 18.17 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 18.18 18.19 -- Obtain user filesystems with umask 0022 (18). 18.20
19.1 --- a/conf/dstest_file_monitor.list Wed Aug 10 00:25:44 2022 +0200 19.2 +++ b/conf/dstest_file_monitor.list Wed Aug 10 23:58:38 2022 +0200 19.3 @@ -5,8 +5,8 @@ 19.4 module l4re 19.5 module ned 19.6 module dstest_file_monitor 19.7 -module dstest_ext2_server 19.8 -module dstest_block_server 19.9 +module ext2_server 19.10 +module block_server 19.11 module lib4re-c.so 19.12 module lib4re-c-util.so 19.13 module lib4re.so
20.1 --- a/conf/dstest_file_readdir.cfg Wed Aug 10 00:25:44 2022 +0200 20.2 +++ b/conf/dstest_file_readdir.cfg Wed Aug 10 23:58:38 2022 +0200 20.3 @@ -12,7 +12,7 @@ 20.4 }, 20.5 log = { "pipes", "r" }, 20.6 }, 20.7 - "rom/dstest_pipe_server", "10"); 20.8 + "rom/pipe_server", "10"); 20.9 20.10 local block_server = l:new_channel(); 20.11 20.12 @@ -22,7 +22,7 @@ 20.13 }, 20.14 log = { "blocksvr", "r" }, 20.15 }, 20.16 - "rom/dstest_block_server", "10"); 20.17 + "rom/block_server", "10"); 20.18 20.19 local ext2svr = l:new_channel(); 20.20 20.21 @@ -34,7 +34,7 @@ 20.22 }, 20.23 log = { "ext2svr", "y" }, 20.24 }, 20.25 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 20.26 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 20.27 20.28 -- Obtain user filesystems with umask 0022 (18). 20.29
21.1 --- a/conf/dstest_file_readdir.list Wed Aug 10 00:25:44 2022 +0200 21.2 +++ b/conf/dstest_file_readdir.list Wed Aug 10 23:58:38 2022 +0200 21.3 @@ -5,9 +5,9 @@ 21.4 module l4re 21.5 module ned 21.6 module dstest_file_readdir 21.7 -module dstest_ext2_server 21.8 -module dstest_block_server 21.9 -module dstest_pipe_server 21.10 +module ext2_server 21.11 +module block_server 21.12 +module pipe_server 21.13 module lib4re-c.so 21.14 module lib4re-c-util.so 21.15 module lib4re.so
22.1 --- a/conf/dstest_file_readdir_concurrent.cfg Wed Aug 10 00:25:44 2022 +0200 22.2 +++ b/conf/dstest_file_readdir_concurrent.cfg Wed Aug 10 23:58:38 2022 +0200 22.3 @@ -12,7 +12,7 @@ 22.4 }, 22.5 log = { "pipes", "r" }, 22.6 }, 22.7 - "rom/dstest_pipe_server", "10"); 22.8 + "rom/pipe_server", "10"); 22.9 22.10 local block_server = l:new_channel(); 22.11 22.12 @@ -22,7 +22,7 @@ 22.13 }, 22.14 log = { "blocksvr", "r" }, 22.15 }, 22.16 - "rom/dstest_block_server", "10"); 22.17 + "rom/block_server", "10"); 22.18 22.19 local ext2svr = l:new_channel(); 22.20 22.21 @@ -34,7 +34,7 @@ 22.22 }, 22.23 log = { "ext2svr", "y" }, 22.24 }, 22.25 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 22.26 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 22.27 22.28 -- Obtain user filesystems with umask 0022 (18). 22.29
23.1 --- a/conf/dstest_file_readdir_concurrent.list Wed Aug 10 00:25:44 2022 +0200 23.2 +++ b/conf/dstest_file_readdir_concurrent.list Wed Aug 10 23:58:38 2022 +0200 23.3 @@ -5,9 +5,9 @@ 23.4 module l4re 23.5 module ned 23.6 module dstest_file_readdir_concurrent 23.7 -module dstest_ext2_server 23.8 -module dstest_block_server 23.9 -module dstest_pipe_server 23.10 +module ext2_server 23.11 +module block_server 23.12 +module pipe_server 23.13 module lib4re-c.so 23.14 module lib4re-c-util.so 23.15 module lib4re.so
24.1 --- a/conf/dstest_file_remove.cfg Wed Aug 10 00:25:44 2022 +0200 24.2 +++ b/conf/dstest_file_remove.cfg Wed Aug 10 23:58:38 2022 +0200 24.3 @@ -12,7 +12,7 @@ 24.4 }, 24.5 log = { "pipes", "r" }, 24.6 }, 24.7 - "rom/dstest_pipe_server", "10"); 24.8 + "rom/pipe_server", "10"); 24.9 24.10 local block_server = l:new_channel(); 24.11 24.12 @@ -22,7 +22,7 @@ 24.13 }, 24.14 log = { "blocksvr", "r" }, 24.15 }, 24.16 - "rom/dstest_block_server", "10"); 24.17 + "rom/block_server", "10"); 24.18 24.19 local ext2svr = l:new_channel(); 24.20 24.21 @@ -34,7 +34,7 @@ 24.22 }, 24.23 log = { "ext2svr", "y" }, 24.24 }, 24.25 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 24.26 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 24.27 24.28 -- Obtain user filesystems with umask 0022 (18). 24.29
25.1 --- a/conf/dstest_file_remove.list Wed Aug 10 00:25:44 2022 +0200 25.2 +++ b/conf/dstest_file_remove.list Wed Aug 10 23:58:38 2022 +0200 25.3 @@ -5,9 +5,9 @@ 25.4 module l4re 25.5 module ned 25.6 module dstest_file_remove 25.7 -module dstest_ext2_server 25.8 -module dstest_block_server 25.9 -module dstest_pipe_server 25.10 +module ext2_server 25.11 +module block_server 25.12 +module pipe_server 25.13 module lib4re-c.so 25.14 module lib4re-c-util.so 25.15 module lib4re.so
26.1 --- a/conf/dstest_file_rename.cfg Wed Aug 10 00:25:44 2022 +0200 26.2 +++ b/conf/dstest_file_rename.cfg Wed Aug 10 23:58:38 2022 +0200 26.3 @@ -12,7 +12,7 @@ 26.4 }, 26.5 log = { "pipes", "r" }, 26.6 }, 26.7 - "rom/dstest_pipe_server", "10"); 26.8 + "rom/pipe_server", "10"); 26.9 26.10 local block_server = l:new_channel(); 26.11 26.12 @@ -22,7 +22,7 @@ 26.13 }, 26.14 log = { "blocksvr", "r" }, 26.15 }, 26.16 - "rom/dstest_block_server", "10"); 26.17 + "rom/block_server", "10"); 26.18 26.19 local ext2svr = l:new_channel(); 26.20 26.21 @@ -34,7 +34,7 @@ 26.22 }, 26.23 log = { "ext2svr", "y" }, 26.24 }, 26.25 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 26.26 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 26.27 26.28 -- Obtain user filesystems with umask 0022 (18). 26.29
27.1 --- a/conf/dstest_file_rename.list Wed Aug 10 00:25:44 2022 +0200 27.2 +++ b/conf/dstest_file_rename.list Wed Aug 10 23:58:38 2022 +0200 27.3 @@ -5,9 +5,9 @@ 27.4 module l4re 27.5 module ned 27.6 module dstest_file_rename 27.7 -module dstest_ext2_server 27.8 -module dstest_block_server 27.9 -module dstest_pipe_server 27.10 +module ext2_server 27.11 +module block_server 27.12 +module pipe_server 27.13 module lib4re-c.so 27.14 module lib4re-c-util.so 27.15 module lib4re.so
28.1 --- a/conf/dstest_fsaccess.cfg Wed Aug 10 00:25:44 2022 +0200 28.2 +++ b/conf/dstest_fsaccess.cfg Wed Aug 10 23:58:38 2022 +0200 28.3 @@ -12,7 +12,7 @@ 28.4 }, 28.5 log = { "pipes", "r" }, 28.6 }, 28.7 - "rom/dstest_pipe_server", "10"); 28.8 + "rom/pipe_server", "10"); 28.9 28.10 local block_server = l:new_channel(); 28.11 28.12 @@ -22,7 +22,7 @@ 28.13 }, 28.14 log = { "blocksvr", "r" }, 28.15 }, 28.16 - "rom/dstest_block_server", "10"); 28.17 + "rom/block_server", "10"); 28.18 28.19 local ext2svr = l:new_channel(); 28.20 28.21 @@ -34,7 +34,7 @@ 28.22 }, 28.23 log = { "ext2svr", "y" }, 28.24 }, 28.25 - "rom/dstest_ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 28.26 + "rom/ext2_server", "blocksvr", "rom/e2test.fs", "10", "ext2svr"); 28.27 28.28 -- Obtain user filesystems with umask 0022 (18). 28.29 28.30 @@ -48,4 +48,4 @@ 28.31 log = { "client", "g" }, 28.32 }, 28.33 -- program, options, operation involving a script file 28.34 - "rom/dstest_fsaccess", "-m", "0022", "script", "rom/fsaccess.txt"); 28.35 + "rom/fsaccess", "-m", "0022", "script", "rom/fsaccess.txt");
29.1 --- a/conf/dstest_fsaccess.list Wed Aug 10 00:25:44 2022 +0200 29.2 +++ b/conf/dstest_fsaccess.list Wed Aug 10 23:58:38 2022 +0200 29.3 @@ -5,10 +5,10 @@ 29.4 module fsaccess.txt 29.5 module l4re 29.6 module ned 29.7 -module dstest_fsaccess 29.8 -module dstest_ext2_server 29.9 -module dstest_block_server 29.10 -module dstest_pipe_server 29.11 +module fsaccess 29.12 +module ext2_server 29.13 +module block_server 29.14 +module pipe_server 29.15 module lib4re-c.so 29.16 module lib4re-c-util.so 29.17 module lib4re.so
30.1 --- a/conf/dstest_host.cfg Wed Aug 10 00:25:44 2022 +0200 30.2 +++ b/conf/dstest_host.cfg Wed Aug 10 23:58:38 2022 +0200 30.3 @@ -12,7 +12,7 @@ 30.4 }, 30.5 log = { "server", "r" }, 30.6 }, 30.7 - "rom/dstest_host_server", "10"); 30.8 + "rom/host_server", "10"); 30.9 30.10 l:startv({ 30.11 caps = {
31.1 --- a/conf/dstest_host.list Wed Aug 10 00:25:44 2022 +0200 31.2 +++ b/conf/dstest_host.list Wed Aug 10 23:58:38 2022 +0200 31.3 @@ -4,7 +4,7 @@ 31.4 module l4re 31.5 module ned 31.6 module dstest_host_client 31.7 -module dstest_host_server 31.8 +module host_server 31.9 module lib4re-c.so 31.10 module lib4re-c-util.so 31.11 module lib4re.so
32.1 --- a/conf/dstest_host_readdir.cfg Wed Aug 10 00:25:44 2022 +0200 32.2 +++ b/conf/dstest_host_readdir.cfg Wed Aug 10 23:58:38 2022 +0200 32.3 @@ -12,7 +12,7 @@ 32.4 }, 32.5 log = { "pipes", "r" }, 32.6 }, 32.7 - "rom/dstest_pipe_server", "10"); 32.8 + "rom/pipe_server", "10"); 32.9 32.10 local host_server = l:new_channel(); 32.11 32.12 @@ -23,7 +23,7 @@ 32.13 }, 32.14 log = { "server", "r" }, 32.15 }, 32.16 - "rom/dstest_host_server", "10"); 32.17 + "rom/host_server", "10"); 32.18 32.19 l:startv({ 32.20 caps = {
33.1 --- a/conf/dstest_host_readdir.list Wed Aug 10 00:25:44 2022 +0200 33.2 +++ b/conf/dstest_host_readdir.list Wed Aug 10 23:58:38 2022 +0200 33.3 @@ -4,8 +4,8 @@ 33.4 module l4re 33.5 module ned 33.6 module dstest_file_readdir 33.7 -module dstest_host_server 33.8 -module dstest_pipe_server 33.9 +module host_server 33.10 +module pipe_server 33.11 module lib4re-c.so 33.12 module lib4re-c-util.so 33.13 module lib4re.so
34.1 --- a/conf/dstest_pipe.cfg Wed Aug 10 00:25:44 2022 +0200 34.2 +++ b/conf/dstest_pipe.cfg Wed Aug 10 23:58:38 2022 +0200 34.3 @@ -12,7 +12,7 @@ 34.4 }, 34.5 log = { "server", "r" }, 34.6 }, 34.7 - "rom/dstest_pipe_server", "10"); 34.8 + "rom/pipe_server", "10"); 34.9 34.10 l:start({ 34.11 caps = {
35.1 --- a/conf/dstest_pipe.list Wed Aug 10 00:25:44 2022 +0200 35.2 +++ b/conf/dstest_pipe.list Wed Aug 10 23:58:38 2022 +0200 35.3 @@ -4,7 +4,7 @@ 35.4 module l4re 35.5 module ned 35.6 module dstest_pipe_client 35.7 -module dstest_pipe_server 35.8 +module pipe_server 35.9 module lib4re-c.so 35.10 module lib4re-c-util.so 35.11 module lib4re.so
36.1 --- a/conf/dstest_test.cfg Wed Aug 10 00:25:44 2022 +0200 36.2 +++ b/conf/dstest_test.cfg Wed Aug 10 23:58:38 2022 +0200 36.3 @@ -12,7 +12,7 @@ 36.4 }, 36.5 log = { "server", "r" }, 36.6 }, 36.7 - "rom/dstest_test_server", "40"); 36.8 + "rom/test_server", "40"); 36.9 36.10 l:start({ 36.11 caps = {
37.1 --- a/conf/dstest_test.list Wed Aug 10 00:25:44 2022 +0200 37.2 +++ b/conf/dstest_test.list Wed Aug 10 23:58:38 2022 +0200 37.3 @@ -4,7 +4,7 @@ 37.4 module l4re 37.5 module ned 37.6 module dstest_test_client 37.7 -module dstest_test_server 37.8 +module test_server 37.9 module lib4re-c.so 37.10 module lib4re-c-util.so 37.11 module lib4re.so
38.1 --- a/fsaccess/Makefile Wed Aug 10 00:25:44 2022 +0200 38.2 +++ b/fsaccess/Makefile Wed Aug 10 23:58:38 2022 +0200 38.3 @@ -1,7 +1,7 @@ 38.4 PKGDIR ?= . 38.5 L4DIR ?= $(PKGDIR)/../../.. 38.6 38.7 -TARGET = dstest_fsaccess 38.8 +TARGET = fsaccess 38.9 38.10 MODE = static 38.11
39.1 --- a/servers/Makefile Wed Aug 10 00:25:44 2022 +0200 39.2 +++ b/servers/Makefile Wed Aug 10 23:58:38 2022 +0200 39.3 @@ -2,23 +2,23 @@ 39.4 L4DIR ?= $(PKGDIR)/../../.. 39.5 39.6 TARGET = \ 39.7 - dstest_block_server \ 39.8 - dstest_ext2_server \ 39.9 - dstest_host_server \ 39.10 - dstest_pipe_server \ 39.11 - dstest_test_server 39.12 + block_server \ 39.13 + ext2_server \ 39.14 + host_server \ 39.15 + pipe_server \ 39.16 + test_server 39.17 39.18 MODE = static 39.19 39.20 -SRC_CC_dstest_block_server = block_file_server.cc 39.21 +SRC_CC_block_server = block_file_server.cc 39.22 39.23 -SRC_CC_dstest_ext2_server = ext2_file_server.cc 39.24 +SRC_CC_ext2_server = ext2_file_server.cc 39.25 39.26 -SRC_CC_dstest_host_server = host_file_server.cc 39.27 +SRC_CC_host_server = host_file_server.cc 39.28 39.29 -SRC_CC_dstest_pipe_server = pipe_server.cc 39.30 +SRC_CC_pipe_server = pipe_server.cc 39.31 39.32 -SRC_CC_dstest_test_server = test_file_server.cc 39.33 +SRC_CC_test_server = test_file_server.cc 39.34 39.35 REQUIRES_LIBS = l4re_c-util libmem libfsserver libipc libstdc++ libsystypes libe2access_blockserver 39.36
40.1 --- a/test_files/programs/Makefile Wed Aug 10 00:25:44 2022 +0200 40.2 +++ b/test_files/programs/Makefile Wed Aug 10 23:58:38 2022 +0200 40.3 @@ -5,7 +5,7 @@ 40.4 40.5 MODE = static 40.6 40.7 -SRC_C_dstest_exec_payload = exec_payload.c 40.8 +SRC_C_dstest_exec_payload = dstest_exec_payload.c 40.9 40.10 REQUIRES_LIBS = libc 40.11
41.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 41.2 +++ b/test_files/programs/dstest_exec_payload.c Wed Aug 10 23:58:38 2022 +0200 41.3 @@ -0,0 +1,39 @@ 41.4 +/* 41.5 + * A test of executing code in a new task. 41.6 + * 41.7 + * Copyright (C) 2022 Paul Boddie <paul@boddie.org.uk> 41.8 + * 41.9 + * This program is free software; you can redistribute it and/or 41.10 + * modify it under the terms of the GNU General Public License as 41.11 + * published by the Free Software Foundation; either version 2 of 41.12 + * the License, or (at your option) any later version. 41.13 + * 41.14 + * This program is distributed in the hope that it will be useful, 41.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 41.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 41.17 + * GNU General Public License for more details. 41.18 + * 41.19 + * You should have received a copy of the GNU General Public License 41.20 + * along with this program; if not, write to the Free Software 41.21 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, 41.22 + * Boston, MA 02110-1301, USA 41.23 + */ 41.24 + 41.25 +#include <stdio.h> 41.26 + 41.27 + 41.28 + 41.29 +int main(int argc, char *argv[]) 41.30 +{ 41.31 + int i; 41.32 + 41.33 + printf("Hello from %s (%d)!\n", argc > 0 ? argv[0] : "exec_payload.c", argc); 41.34 + 41.35 + for (i = 0; i < argc; i++) 41.36 + printf("Arg #%d: %s\n", i, argv[i]); 41.37 + 41.38 + return 0; 41.39 +} 41.40 + 41.41 +/* vim: tabstop=2 expandtab shiftwidth=2 41.42 +*/
42.1 --- a/test_files/programs/exec_payload.c Wed Aug 10 00:25:44 2022 +0200 42.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 42.3 @@ -1,39 +0,0 @@ 42.4 -/* 42.5 - * A test of executing code in a new task. 42.6 - * 42.7 - * Copyright (C) 2022 Paul Boddie <paul@boddie.org.uk> 42.8 - * 42.9 - * This program is free software; you can redistribute it and/or 42.10 - * modify it under the terms of the GNU General Public License as 42.11 - * published by the Free Software Foundation; either version 2 of 42.12 - * the License, or (at your option) any later version. 42.13 - * 42.14 - * This program is distributed in the hope that it will be useful, 42.15 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 42.16 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 42.17 - * GNU General Public License for more details. 42.18 - * 42.19 - * You should have received a copy of the GNU General Public License 42.20 - * along with this program; if not, write to the Free Software 42.21 - * Foundation, Inc., 51 Franklin Street, Fifth Floor, 42.22 - * Boston, MA 02110-1301, USA 42.23 - */ 42.24 - 42.25 -#include <stdio.h> 42.26 - 42.27 - 42.28 - 42.29 -int main(int argc, char *argv[]) 42.30 -{ 42.31 - int i; 42.32 - 42.33 - printf("Hello from %s (%d)!\n", argc > 0 ? argv[0] : "exec_payload.c", argc); 42.34 - 42.35 - for (i = 0; i < argc; i++) 42.36 - printf("Arg #%d: %s\n", i, argv[i]); 42.37 - 42.38 - return 0; 42.39 -} 42.40 - 42.41 -/* vim: tabstop=2 expandtab shiftwidth=2 42.42 -*/