From 79ab0cf98e30d96ec780840f45bc04cdc058a129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= <josef.soentgen@genode-labs.com>
Date: Mon, 11 Nov 2024 16:54:45 +0100
Subject: [PATCH] ports: remove sub-init from vbox6 pkgs

Using a sub-init is no longer necessary and simplifies the runtime
configuration.
---
 .../ports/recipes/pkg/vbox6-capture/archives  |   1 -
 repos/ports/recipes/pkg/vbox6-capture/runtime | 105 +++++-------------
 repos/ports/recipes/pkg/vbox6/archives        |   1 -
 repos/ports/recipes/pkg/vbox6/runtime         | 102 +++++------------
 4 files changed, 53 insertions(+), 156 deletions(-)

diff --git a/repos/ports/recipes/pkg/vbox6-capture/archives b/repos/ports/recipes/pkg/vbox6-capture/archives
index fd5314ece3..2325c2c170 100644
--- a/repos/ports/recipes/pkg/vbox6-capture/archives
+++ b/repos/ports/recipes/pkg/vbox6-capture/archives
@@ -1,6 +1,5 @@
 _/raw/vbox6
 _/src/expat
-_/src/init
 _/src/jpeg
 _/src/libc
 _/src/libdrm
diff --git a/repos/ports/recipes/pkg/vbox6-capture/runtime b/repos/ports/recipes/pkg/vbox6-capture/runtime
index 2947d60693..f87652527e 100644
--- a/repos/ports/recipes/pkg/vbox6-capture/runtime
+++ b/repos/ports/recipes/pkg/vbox6-capture/runtime
@@ -1,4 +1,4 @@
-<runtime ram="4300M" caps="8000" binary="init">
+<runtime ram="4300M" caps="2500" binary="virtualbox6">
 
 	<requires>
 		<file_system label="vm"/>
@@ -22,80 +22,30 @@
 		<record/>
 	</requires>
 
-	<config verbose="yes">
-
-		<parent-provides>
-			<service name="ROM"/>
-			<service name="PD"/>
-			<service name="RM"/>
-			<service name="CPU"/>
-			<service name="LOG"/>
-			<service name="VM"/>
-			<service name="Gui"/>
-			<service name="Gpu"/>
-			<service name="Timer"/>
-			<service name="Rtc"/>
-			<service name="Report"/>
-			<service name="File_system"/>
-			<service name="Usb"/>
-			<service name="Nic"/>
-			<service name="Play"/>
-			<service name="Record"/>
-			<service name="Capture"/>
-		</parent-provides>
-
-		<default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>
-
-		<default caps="100"/>
-
-		<start name="vbox" caps="7000">
-			<binary name="virtualbox6" />
-			<resource name="RAM" quantum="8G"/>
-			<exit propagate="yes"/>
-			<config vbox_file="machine.vbox6" xhci="yes" vm_name="linux" capslock="rom" ld_verbose="yes">
-				<vfs>
-					<dir name="dev">
-						<log/> <rtc/> <null/> <gpu/> <zero/>
-						<oss name="dsp" min_ofrag_size="8192" min_ifrag_size="8192"/>
-					</dir>
-					<dir name="pipe"> <pipe/> </dir>
-					<dir name="shared"> <fs label="shared" writeable="yes"/> </dir>
-					<rom name="VBoxSharedClipboard.so"/>
-					<rom name="VBoxSharedFolders.so"/>
-					<fs writeable="yes"/>
-				</vfs>
-				<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/pipe">
-					<pthread placement="single-cpu"/>
-				</libc>
-				<webcam vertical_flip="true" fps="30" screen_size="false" width="640" height="480"/>
-				<arg value="virtualbox"/>
-				<env key="VBOX_USER_HOME" value="/"/>
-				<env key="VBOX_LOG_DEST"          value="file=/dev/log"/>
-				<env key="VBOX_LOG"               value="+dbgf+gim"/>
-				<env key="VBOX_LOG_FLAGS"         value="thread"/>
-				<env key="VBOX_RELEASE_LOG_DEST"  value="file=/dev/log"/>
-				<env key="VBOX_RELEASE_LOG"       value=""/>
-				<env key="VBOX_RELEASE_LOG_FLAGS" value="thread"/>
-			</config>
-			<route>
-				<service name="File_system" label="shared"> <parent label="shared"/>        </service>
-				<service name="File_system">                <parent label="vm"/>            </service>
-				<service name="ROM" label="capslock">       <parent label="capslock"/>      </service>
-				<service name="ROM" label="platform_info">  <parent label="platform_info"/> </service>
-				<service name="ROM" label="VBoxSharedClipboard.so">
-				  <parent label="virtualbox6-sharedclipboard.lib.so"/> </service>
-				<service name="ROM" label="VBoxSharedFolders.so">
-				  <parent label="virtualbox6-sharedfolders.lib.so"/> </service>
-				<service name="ROM" label="mesa_gpu.lib.so">
-				  <parent label="mesa_gpu.lib.so"/> </service>
-				<service name="Nic">                        <parent/>                       </service>
-				<service name="Report" label="shape">       <parent label="shape"/>         </service>
-				<service name="ROM"    label="clipboard">   <parent label="clipboard"/>     </service>
-				<service name="Report" label="clipboard">   <parent label="clipboard"/>     </service>
-				<service name="Gui">                        <parent label=""/>              </service>
-				<any-service> <parent/> </any-service>
-			</route>
-		</start>
+	<config vbox_file="machine.vbox6" xhci="yes" vm_name="linux" capslock="rom" ld_verbose="yes">
+		<vfs>
+			<dir name="dev">
+				<log/> <rtc/> <null/> <gpu/> <zero/>
+				<oss name="dsp" min_ofrag_size="8192" min_ifrag_size="8192"/>
+			</dir>
+			<dir name="pipe"> <pipe/> </dir>
+			<dir name="shared"> <fs label="shared" writeable="yes"/> </dir>
+			<rom name="VBoxSharedClipboard.so"/>
+			<rom name="VBoxSharedFolders.so"/>
+			<fs label="vm" writeable="yes"/>
+		</vfs>
+		<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/pipe">
+			<pthread placement="single-cpu"/>
+		</libc>
+		<webcam vertical_flip="true" fps="30" screen_size="false" width="640" height="480"/>
+		<arg value="virtualbox"/>
+		<env key="VBOX_USER_HOME" value="/"/>
+		<env key="VBOX_LOG_DEST"          value="file=/dev/log"/>
+		<env key="VBOX_LOG"               value="+dbgf+gim"/>
+		<env key="VBOX_LOG_FLAGS"         value="thread"/>
+		<env key="VBOX_RELEASE_LOG_DEST"  value="file=/dev/log"/>
+		<env key="VBOX_RELEASE_LOG"       value=""/>
+		<env key="VBOX_RELEASE_LOG_FLAGS" value="thread"/>
 	</config>
 
 	<content>
@@ -103,7 +53,6 @@
 		<rom label="expat.lib.so"/>
 		<rom label="glapi.lib.so"/>
 		<rom label="ld.lib.so"/>
-		<rom label="init"/>
 		<rom label="virtualbox6"/>
 		<rom label="jpeg.lib.so"/>
 		<rom label="libc.lib.so"/>
@@ -119,8 +68,8 @@
 		<rom label="vfs_oss.lib.so"/>
 		<rom label="vfs_pipe.lib.so"/>
 		<rom label="virtualbox6-shaderlib.lib.so"/>
-		<rom label="virtualbox6-sharedclipboard.lib.so"/>
-		<rom label="virtualbox6-sharedfolders.lib.so"/>
+		<rom label="virtualbox6-sharedclipboard.lib.so" as="VBoxSharedClipboard.so"/>
+		<rom label="virtualbox6-sharedfolders.lib.so" as="VBoxSharedFolders.so"/>
 		<rom label="zlib.lib.so"/>
 	</content>
 
diff --git a/repos/ports/recipes/pkg/vbox6/archives b/repos/ports/recipes/pkg/vbox6/archives
index fd5314ece3..2325c2c170 100644
--- a/repos/ports/recipes/pkg/vbox6/archives
+++ b/repos/ports/recipes/pkg/vbox6/archives
@@ -1,6 +1,5 @@
 _/raw/vbox6
 _/src/expat
-_/src/init
 _/src/jpeg
 _/src/libc
 _/src/libdrm
diff --git a/repos/ports/recipes/pkg/vbox6/runtime b/repos/ports/recipes/pkg/vbox6/runtime
index ad971486af..5045d34c57 100644
--- a/repos/ports/recipes/pkg/vbox6/runtime
+++ b/repos/ports/recipes/pkg/vbox6/runtime
@@ -1,4 +1,4 @@
-<runtime ram="4300M" caps="8000" binary="init">
+<runtime ram="4300M" caps="2500" binary="virtualbox6">
 
 	<requires>
 		<file_system label="vm"/>
@@ -21,78 +21,29 @@
 		<record/>
 	</requires>
 
-	<config verbose="yes">
-
-		<parent-provides>
-			<service name="ROM"/>
-			<service name="PD"/>
-			<service name="RM"/>
-			<service name="CPU"/>
-			<service name="LOG"/>
-			<service name="VM"/>
-			<service name="Gui"/>
-			<service name="Gpu"/>
-			<service name="Timer"/>
-			<service name="Rtc"/>
-			<service name="Report"/>
-			<service name="File_system"/>
-			<service name="Usb"/>
-			<service name="Nic"/>
-			<service name="Play"/>
-			<service name="Record"/>
-		</parent-provides>
-
-		<default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>
-
-		<default caps="100"/>
-
-		<start name="vbox" caps="7000">
-			<binary name="virtualbox6" />
-			<resource name="RAM" quantum="8G"/>
-			<exit propagate="yes"/>
-			<config vbox_file="machine.vbox6" xhci="yes" vm_name="linux" capslock="rom" ld_verbose="yes">
-				<vfs>
-					<dir name="dev">
-						<log/> <rtc/> <null/> <gpu/> <zero/>
-						<oss name="dsp" min_ofrag_size="8192" min_ifrag_size="8192"/>
-					</dir>
-					<dir name="pipe"> <pipe/> </dir>
-					<dir name="shared"> <fs label="shared" writeable="yes"/> </dir>
-					<rom name="VBoxSharedClipboard.so"/>
-					<rom name="VBoxSharedFolders.so"/>
-					<fs writeable="yes"/>
-				</vfs>
-				<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/pipe">
-					<pthread placement="single-cpu"/>
-				</libc>
-				<arg value="virtualbox"/>
-				<env key="VBOX_USER_HOME" value="/"/>
-				<env key="VBOX_LOG_DEST"          value="file=/dev/log"/>
-				<env key="VBOX_LOG"               value="+dbgf+gim"/>
-				<env key="VBOX_LOG_FLAGS"         value="thread"/>
-				<env key="VBOX_RELEASE_LOG_DEST"  value="file=/dev/log"/>
-				<env key="VBOX_RELEASE_LOG"       value=""/>
-				<env key="VBOX_RELEASE_LOG_FLAGS" value="thread"/>
-			</config>
-			<route>
-				<service name="File_system" label="shared"> <parent label="shared"/>        </service>
-				<service name="File_system">                <parent label="vm"/>            </service>
-				<service name="ROM" label="capslock">       <parent label="capslock"/>      </service>
-				<service name="ROM" label="platform_info">  <parent label="platform_info"/> </service>
-				<service name="ROM" label="VBoxSharedClipboard.so">
-				  <parent label="virtualbox6-sharedclipboard.lib.so"/> </service>
-				<service name="ROM" label="VBoxSharedFolders.so">
-				  <parent label="virtualbox6-sharedfolders.lib.so"/> </service>
-				<service name="ROM" label="mesa_gpu.lib.so">
-				  <parent label="mesa_gpu.lib.so"/> </service>
-				<service name="Nic">                        <parent/>                       </service>
-				<service name="Report" label="shape">       <parent label="shape"/>         </service>
-				<service name="ROM"    label="clipboard">   <parent label="clipboard"/>     </service>
-				<service name="Report" label="clipboard">   <parent label="clipboard"/>     </service>
-				<service name="Gui">                        <parent label=""/>              </service>
-				<any-service> <parent/> </any-service>
-			</route>
-		</start>
+	<config vbox_file="machine.vbox6" xhci="yes" vm_name="linux" capslock="rom" ld_verbose="yes">
+		<vfs>
+			<dir name="dev">
+				<log/> <rtc/> <null/> <gpu/> <zero/>
+				<oss name="dsp" min_ofrag_size="8192" min_ifrag_size="8192"/>
+			</dir>
+			<dir name="pipe"> <pipe/> </dir>
+			<dir name="shared"> <fs label="shared" writeable="yes"/> </dir>
+			<rom name="VBoxSharedClipboard.so"/>
+			<rom name="VBoxSharedFolders.so"/>
+			<fs label="vm" writeable="yes"/>
+		</vfs>
+		<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/pipe">
+			<pthread placement="single-cpu"/>
+		</libc>
+		<arg value="virtualbox"/>
+		<env key="VBOX_USER_HOME" value="/"/>
+		<env key="VBOX_LOG_DEST"          value="file=/dev/log"/>
+		<env key="VBOX_LOG"               value="+dbgf+gim"/>
+		<env key="VBOX_LOG_FLAGS"         value="thread"/>
+		<env key="VBOX_RELEASE_LOG_DEST"  value="file=/dev/log"/>
+		<env key="VBOX_RELEASE_LOG"       value=""/>
+		<env key="VBOX_RELEASE_LOG_FLAGS" value="thread"/>
 	</config>
 
 	<content>
@@ -100,7 +51,6 @@
 		<rom label="expat.lib.so"/>
 		<rom label="glapi.lib.so"/>
 		<rom label="ld.lib.so"/>
-		<rom label="init"/>
 		<rom label="virtualbox6"/>
 		<rom label="jpeg.lib.so"/>
 		<rom label="libc.lib.so"/>
@@ -116,8 +66,8 @@
 		<rom label="vfs_oss.lib.so"/>
 		<rom label="vfs_pipe.lib.so"/>
 		<rom label="virtualbox6-shaderlib.lib.so"/>
-		<rom label="virtualbox6-sharedclipboard.lib.so"/>
-		<rom label="virtualbox6-sharedfolders.lib.so"/>
+		<rom label="virtualbox6-sharedclipboard.lib.so" as="VBoxSharedClipboard.so"/>
+		<rom label="virtualbox6-sharedfolders.lib.so" as="VBoxSharedFolders.so"/>
 		<rom label="zlib.lib.so"/>
 	</content>