Remove rump_fs server component

This patch replaces the use of the rump_fs server by the VFS server with the Rump VFS plugin. Issue #3512
genodelabs · Oct 8, 2019 · e44953f · e44953f
1 parent 5c0c621
commit e44953f
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 1,717 deletions.
diff --git a/repos/dde_rump/recipes/src/rump/content.mk b/repos/dde_rump/recipes/src/rump/content.mk
@@ -14,7 +14,7 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_rump)
 
 MIRROR_FROM_REP_DIR := $(LIB_MK) \
                        lib/import/import-rump.mk \
-                       src/lib src/server/rump_fs \
+                       src/lib \
                        include/rump include/rump_fs \
                        include/util
 

diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run
@@ -14,7 +14,8 @@ set dd     [installed_command dd]
 set build_components {
 	core init timer
 	server/ram_block
-	server/rump_fs
+	server/vfs
+	lib/vfs/rump
 	test/libc_vfs
 }
 
@@ -56,10 +57,13 @@ append config {
 		<provides><service name="Block"/></provides>
 		<config file="ext2.raw" block_size="512"/>
 	</start>
-	<start name="rump_fs" caps="200">
+	<start name="vfs" caps="200">
 		<resource name="RAM" quantum="16M" />
 		<provides><service name="File_system"/></provides>
-		<config fs="ext2fs"><policy label_prefix="test-libc_vfs" root="/" writeable="yes"/></config>
+		<config>
+			<vfs> <rump fs="ext2fs" ram="10M"/> </vfs>
+			<policy label_prefix="test-libc_vfs" root="/" writeable="yes"/>
+		</config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="4M"/>
@@ -82,7 +86,7 @@ install_config $config
 # generic modules
 set boot_modules {
 	core ld.lib.so init timer test-libc_vfs ram_block
-	rump.lib.so rump_fs.lib.so rump_fs
+	rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so
 	ext2.raw libc.lib.so vfs.lib.so
 }
 

diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run
@@ -14,7 +14,8 @@ set dd   [installed_command dd]
 set build_components {
 	core init timer
 	server/ram_block
-	server/rump_fs
+	server/vfs
+	lib/vfs/rump
 	test/libc_vfs
 }
 
@@ -56,20 +57,24 @@ append config {
 		<provides><service name="Block"/></provides>
 		<config file="fs.raw" block_size="512"/>
 	</start>
-	<start name="rump_fs" caps="200">
+	<start name="vfs" caps="200">
 		<resource name="RAM" quantum="10M" />
 		<provides><service name="File_system"/></provides>
-		<config fs="msdos"><default-policy root="/" writeable="yes"/></config>
+		<config>
+			<vfs>
+				<rump fs="msdos" ram="8M"/>
+			</vfs>
+			<default-policy root="/" writeable="yes"/>
+		</config>
 	</start>
 	<start name="test-libc_vfs">
 		<resource name="RAM" quantum="4M"/>
 		<config>
-			<libc stdout="/dev/log">
-				<vfs>
-					<dir name="dev"> <log/> </dir>
-					<fs/>
-				</vfs>
-			</libc>
+			<libc stdout="/dev/log"/>
+			<vfs>
+				<dir name="dev"> <log/> </dir>
+				<fs/>
+			</vfs>
 		</config>
 	</start>
 </config>}
@@ -83,7 +88,7 @@ install_config $config
 # generic modules
 set boot_modules {
 	core ld.lib.so init timer test-libc_vfs ram_block
-	rump.lib.so rump_fs.lib.so rump_fs
+	rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so
 	fs.raw libc.lib.so vfs.lib.so
 }
 

diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run
@@ -14,7 +14,8 @@ set build_components {
 	core init timer
 	server/fs_rom
 	server/rom_block
-	server/rump_fs
+	server/vfs
+	lib/vfs/rump
 	test/iso
 }
 
@@ -49,10 +50,13 @@ append config {
 		<provides><service name="Block"/></provides>
 		<config file="fs.iso" block_size="2048"/>
 	</start>
-	<start name="rump_fs" caps="200">
-		<resource name="RAM" quantum="10M" />
+	<start name="vfs" caps="200">
+		<resource name="RAM" quantum="12M" />
 		<provides><service name="File_system"/></provides>
-		<config fs="cd9660"><policy label_prefix="fs_rom" root="/" writeable="no"/></config>
+		<config>
+			<vfs> <rump fs="cd9660" ram="10M" writeable="no"/> </vfs>
+			<policy label_prefix="fs_rom" root="/" writeable="no"/>
+		</config>
 	</start>
 	<start name="fs_rom">
 		<resource name="RAM" quantum="2M"/>
@@ -88,7 +92,7 @@ install_config $config
 #
 set boot_modules {
 	core ld.lib.so init timer test-iso rom_block
-	rump.lib.so rump_fs.lib.so rump_fs
+	rump.lib.so rump_fs.lib.so vfs_rump.lib.so vfs vfs.lib.so
 	fs.iso fs_rom
 }
 

diff --git a/repos/dde_rump/run/vfs_stress_rump_fs.run b/repos/dde_rump/run/vfs_stress_rump_fs.run
@@ -10,7 +10,7 @@
 set mke2fs [installed_command mke2fs]
 set dd     [installed_command dd]
 
-build "core init timer test/vfs_stress server/ram_block server/rump_fs"
+build "core init timer test/vfs_stress server/ram_block server/vfs lib/vfs/rump"
 
 #
 # Build EXT2-file-system image
@@ -50,10 +50,11 @@ install_config {
 		<provides><service name="Block"/></provides>
 		<config file="ext2.raw" block_size="512"/>
 	</start>
-	<start name="rump_fs" caps="200">
+	<start name="vfs" caps="200">
 		<resource name="RAM" quantum="24M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config fs="ext2fs">
+		<config>
+			<vfs> <rump fs="ext2fs" ram="20M"/> </vfs>
 			<default-policy root="/" writeable="yes"/>
 		</config>
 	</start>
@@ -62,7 +63,7 @@ install_config {
 
 set boot_modules {
  	core init ld.lib.so timer vfs_stress
-	rump.lib.so rump_fs.lib.so rump_fs
+	rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so
 	ram_block ext2.raw vfs.lib.so
 }