alex/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove use of <configfile> feature of init

Browse Source 
Issue #3753
This commit is contained in:
Norman Feske
2020-05-08 16:21:20 +02:00
parent 07502ce6bb
commit c39a342fe5
18 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
repos/ports/run/seoul.inc
View File

@@ -359,7 +359,9 @@ append config "
<resource name=\"RAM\" quantum=\"$memory_vmm_vm\"/>"
append config {
<route>
<service name="Timer"><child name="timer"/></service>}
<service name="Timer"><child name="timer"/></service>
<service name="ROM" label="config">
<parent label="vm_seoul.cfg"/> </service>}
append_if [expr $use_nic_session && $use_nic_bridge] config {
<service name="Nic"> <child name="nic_bridge"/> </service>}
append_if [expr $use_nic_session && !$use_nic_bridge] config {
@@ -367,7 +369,6 @@ append_if [expr $use_nic_session && !$use_nic_bridge] config {
append_if $use_genode_iso config {
<service name="ROM" unscoped_label="seoul"> <parent/> </service>
<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service>
<service name="ROM" label="vm_seoul.cfg"> <parent/> </service>
<service name="ROM" label="platform_info"> <parent/> </service>
<service name="ROM"><child name="iso9660"/></service>}
append_if $use_block_vdi config {
@@ -378,7 +379,6 @@ append config {
<service name="Rtc"><child name="rtc_drv"/></service>
<any-service><parent/><any-child/></any-service>
</route>
<configfile name="vm_seoul.cfg"/>
</start> }
}
@@ -452,9 +452,10 @@ append_if $use_fancy_stuff config {
</start>
<start name="launchpad" priority="-2" caps="1500">
<resource name="RAM" quantum="64000M"/>
<configfile name="launchpad-config"/>
<route>
<service name="Nic"><child name="nic_bridge"/></service>
<service name="Nic"> <child name="nic_bridge"/> </service>
<service name="ROM" label="config">
<parent label="launchpad-config"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start>}
@@ -496,9 +497,10 @@ if {$use_fancy_stuff} {
<route>
<service name="Timer"><parent/></service>
<service name="Nic"><parent/></service>
<service name="ROM" label="config">
<parent label="vm_seoul.cfg"/> </service>
<any-service><parent/></any-service>
</route>
<configfile name="vm_seoul.cfg"/>
</start>
</config>
</launcher>}

11
repos/ports/run/vbox5_genode_usb_hid.run
View File

@@ -113,11 +113,10 @@ append config {
<start name="usb_report_filter" priority="-1">
<resource name="RAM" quantum="1200K"/>
<configfile name="usb_report_filter.config"/>
<route>
<service name="Report"><child name="report_rom" /></service>
<service name="ROM" label="usb_report_filter.config">
<child name="usb_config_rom"/>
<service name="ROM" label="config">
<child name="usb_config_rom" label="usb_report_filter.config"/>
</service>
<service name="ROM" label="devices">
<child name="report_rom"/>
@@ -134,12 +133,12 @@ append config {
<start name="usb_drv" priority="-1">
<resource name="RAM" quantum="16M"/>
<provides><service name="Usb"/></provides>
<configfile name="usb_drv.config"/>
<provides> <service name="Usb"/> </provides>
<route>
<service name="IRQ"><child name="acpi_drv" /></service>
<service name="Report"> <child name="report_rom" /> </service>
<service name="ROM" label="usb_drv.config"><child name="usb_config_rom"/></service>
<service name="ROM" label="config">
<child name="usb_config_rom" label="usb_drv.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

4
repos/ports/run/vbox_win.inc
View File

@@ -126,12 +126,12 @@ append config_of_app {
<start name="nitpicker" priority="-1" caps="150">
<resource name="RAM" quantum="12M"/>
<provides><service name="Nitpicker"/></provides>
<configfile name="nitpicker.config"/>
<route>
<service name="Framebuffer"> <child name="fb_drv" /> </service>
<service name="Input"> <child name="input_filter" /> </service>
<service name="Report"> <child name="report_rom" /> </service>
<service name="ROM" label="nitpicker.config"> <child name="dynamic-config"/> </service>
<service name="ROM" label="config">
<child name="dynamic-config" label="nitpicker.config"/> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>

9
repos/ports/run/virtualbox_auto.inc
View File

@@ -315,11 +315,10 @@ append_if [expr $use_usb] config {
<start name="usb_report_filter" priority="-1">
<resource name="RAM" quantum="1200K"/>
<configfile name="usb_report_filter.config"/>
<route>
<service name="Report"><child name="report_rom"/></service>
<service name="ROM" label="usb_report_filter.config">
<child name="usb_config_rom"/>
<service name="ROM" label="config">
<child name="usb_config_rom" label="usb_report_filter.config"/>
</service>
<service name="ROM" label="devices">
<child name="report_rom"/>
@@ -340,10 +339,10 @@ append_if [expr $use_usb] config {
<service name="Input"/>
<service name="Usb"/>
</provides>
<configfile name="usb_drv.config"/>
<route>
<service name="Report"><child name="report_rom"/></service>
<service name="ROM" label="usb_drv.config"><child name="usb_config_rom"/></service>
<service name="ROM" label="config">
<child name="usb_config_rom" label="usb_drv.config"/> </service>
<any-service><parent/><any-child/></any-service>
</route>
</start>