run: use unambigously named components and pkgs

run/dosbox.run

@@ -1,36 +1,16 @@
-#
-# Build
-#
-
-set build_components {
-	core init
-	timer
-	drivers/audio
-	drivers/framebuffer drivers/input
-	app/dosbox
-}
-
-source ${genode_dir}/repos/base/run/platform_drv.inc
-# override default platform driver policy
-proc platform_drv_policy {} {
-	return {
-			<policy label_prefix="ps2_drv"> <device name="PS2"/> </policy>
-			<policy label_prefix="usb_drv"> <pci class="USB"/> </policy>
-			<policy label_prefix="fb_drv">  <pci class="VGA"/> </policy>
-			<policy label_prefix="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
-}
-
-append_platform_drv_build_components
-
-build $build_components
-
 create_boot_directory
+build { app/dosbox }
+import_from_depot [depot_user]/src/[base_src] \
+                  [depot_user]/pkg/[drivers_interactive_pkg] \
+                  [depot_user]/src/init \
+                  [depot_user]/src/libc \
+                  [depot_user]/src/libpng \
+                  [depot_user]/src/sdl \
+                  [depot_user]/src/stdcxx \
+                  [depot_user]/src/vfs \
+                  [depot_user]/src/zlib
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
 	<parent-provides>
 		<service name="ROM"/>
@@ -45,49 +25,26 @@ append config {
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
-	<default caps="100"/>}
+	<default caps="100"/>
 
-append_if [have_spec sdl] config {
-	<start name="fb_sdl" ld="no">
-		<resource name="RAM" quantum="4M"/>
-		<provides>
-			<service name="Input"/>
-			<service name="Framebuffer"/>
-		</provides>
-		<config width="640" height="480"/>
-	</start>}
-
-append_platform_drv_config
-
-append_if [have_spec vesa] config {
-	<start name="fb_drv" caps="200">
-		<resource name="RAM" quantum="4M"/>
-		<provides><service name="Framebuffer"/></provides>
-		<config buffered="yes"> </config>
-	</start>}
-
-append_if [have_spec pl11x] config {
-	<start name="fb_drv">
-		<resource name="RAM" quantum="2M"/>
-		<provides><service name="Framebuffer"/></provides>
-	</start>}
-
-append_if [have_spec ps2] config {
-	<start name="ps2_drv">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="Input"/></provides>
-	</start>}
-
-append config {
-	<start name="audio_drv">
-		<binary name="} [audio_drv_binary] {"/>
-		<resource name="RAM" quantum="6M"/>
-		<provides><service name="Audio_out"/></provides>
-	</start>
 	<start name="timer">
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Timer"/></provides>
 	</start>
+
+	<start name="drivers" caps="1500">
+		<resource name="RAM" quantum="32M" constrain_phys="yes"/>
+		<binary name="init"/>
+		<route>
+			<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
+			<service name="Timer"> <child name="timer"/> </service>
+			<any-service> <parent/> </any-service>
+		</route>
+		<provides>
+			<service name="Input"/> <service name="Framebuffer"/>
+		</provides>
+	</start>
+
 	<start name="dosbox" caps="200">
 		<resource name="RAM" quantum="128M"/>
 		<config>
@@ -102,8 +59,6 @@ append config {
 	</start>
 </config>}
 
-install_config $config
-
 if {![file exists bin/dosbox.tar]} {
 	puts ""
 	puts "You need to provide 'bin/dosbox.tar' that contains the DOS game you want to"
@@ -113,30 +68,5 @@ if {![file exists bin/dosbox.tar]} {
 	exit 1
 }
 
-#
-# Boot modules
-#
-
-# generic modules
-append boot_modules {
-	core init timer } [audio_drv_binary] {
-	ld.lib.so
-	libc.lib.so vfs.lib.so
-	libm.lib.so libpng.lib.so
-	stdcxx.lib.so sdl.lib.so sdl_net.lib.so zlib.lib.so
-	dosbox dosbox.tar
-}
-
-# platform-specific modules
-lappend_if [have_spec linux] boot_modules fb_sdl
-lappend_if [have_spec vesa]  boot_modules fb_drv
-lappend_if [have_spec ps2]   boot_modules ps2_drv
-lappend_if [have_spec pl11x] boot_modules fb_drv
-
-append_platform_drv_boot_modules
-
-build_boot_image $boot_modules
-
-append qemu_args "  -soundhw es1370 "
-
+build_boot_image { dosbox dosbox.tar }
 run_genode_until forever