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

Remove use of <configfile> feature of init 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/dde_linux/run/intel_fb.run
View File

@ -129,9 +129,9 @@ append config {
<start name="intel_fb_drv" caps="1000">
<resource name="RAM" quantum="60M"/>
<provides><service name="Framebuffer"/></provides>
<configfile name="fb_drv.config"/>
<route>
<service name="ROM" label="fb_drv.config"> <child name="config_rom"/> </service>
<service name="ROM" label="config">
<child name="config_rom" label="fb_drv.config"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>

4
repos/dde_linux/run/vfs_cfg.run
View File

@ -64,9 +64,9 @@ append config {
<binary name="vfs"/>
<resource name="RAM" quantum="32M"/>
<provides> <service name="File_system"/> </provides>
<configfile name="socket_fs.config"/>
<route>
<service name="ROM" label="socket_fs.config"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="config">
<child name="dynamic_rom" label="socket_fs.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

8
repos/gems/run/cpu_load_display.run
View File

@ -126,9 +126,9 @@ install_config {
<start name="cpu_burner.1">
<binary name="cpu_burner"/>
<resource name="RAM" quantum="1M"/>
<configfile name="cpu_burner1.config"/>
<route>
<service name="ROM" label="cpu_burner1.config"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="config">
<child name="dynamic_rom" label="cpu_burner1.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
@ -136,9 +136,9 @@ install_config {
<start name="cpu_burner.2">
<binary name="cpu_burner"/>
<resource name="RAM" quantum="1M"/>
<configfile name="cpu_burner2.config"/>
<route>
<service name="ROM" label="cpu_burner2.config"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="config">
<child name="dynamic_rom" label="cpu_burner2.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

5
repos/gems/run/nano3d.run
View File

@ -101,10 +101,9 @@ append config {
<start name="nano3d">
<resource name="RAM" quantum="8M"/>
<configfile name="nano3d.config"/>
<route>
<service name="ROM" label="nano3d.config">
<child name="dynamic_rom" /> </service>
<service name="ROM" label="config">
<child name="dynamic_rom" label="nano3d.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

5
repos/gems/run/nit_fader.run
View File

@ -93,10 +93,9 @@ install_config {
<start name="nit_fader">
<resource name="RAM" quantum="5M"/>
<provides><service name="Nitpicker"/></provides>
<configfile name="nit_fader.config" />
<route>
<service name="ROM" label="nit_fader.config">
<child name="dynamic_rom" />
<service name="ROM" label="config">
<child name="dynamic_rom" label="nit_fader.config"/>
</service>
<service name="Nitpicker"> <child name="nitpicker" /> </service>
<any-service> <parent/> <any-child/> </any-service>

4
repos/libports/run/netty.inc
View File

@ -80,9 +80,9 @@ append config {
<provides> <service name="File_system"/> </provides>}
if {[use_dynamic_rom]} { append config {
<configfile name="socket_fs.config"/>
<route>
<service name="ROM" label="socket_fs.config"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="config">
<child name="dynamic_rom" label="socket_fs.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>}
} else { append config {

5
repos/libports/src/lib/qt5/qpluginwidget/qpluginwidget.cpp
View File

@ -52,10 +52,9 @@ const char *config = " \
</start> \
<start name=\"init\" caps=\"2000\"> \
<resource name=\"RAM\" quantum=\"2G\"/> \
<configfile name=\"config.plugin\"/> \
<route> \
<service name=\"ROM\" label=\"config.plugin\"> \
<child name=\"tar_rom\"/> \
<service name=\"ROM\" label=\"config\"> \
<child name=\"tar_rom\" label=\"config.plugin\"/> \
</service> \
<any-service> <parent /> </any-service> \
</route> \

5
repos/os/recipes/pkg/test-dynamic_config/runtime
View File

@ -36,10 +36,9 @@
</start>
<start name="test-dynamic_config" caps="500">
<resource name="RAM" quantum="1M"/>
<configfile name="config.dynamic" />
<route>
<service name="ROM" label="config.dynamic">
<child name="test-dynamic_config_server"/>
<service name="ROM" label="config">
<child name="test-dynamic_config_server" label="config.dynamic"/>
</service>
<any-service> <parent /> </any-service>
</route>

5
repos/os/recipes/pkg/test-init/runtime
View File

@ -37,7 +37,7 @@
<resource name="RAM" quantum="2M"/>
<provides> <service name="ROM"/> <service name="Report"/> </provides>
<config verbose="no">
<policy label="init -> init.config" report="test-init -> init.config"/>
<policy label="init -> config" report="test-init -> init.config"/>
<policy label="test-init -> state" report="init -> state"/>
</config>
</start>
@ -56,9 +56,8 @@
<start name="init" caps="2000" priority="-1">
<binary name="init"/>
<resource name="RAM" quantum="16M"/>
<configfile name="init.config"/>
<route>
<service name="ROM" label="init.config"> <child name="report_rom"/> </service>
<service name="ROM" label="config"> <child name="report_rom"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<service name="LOG"> <child name="test-init"/> </service>

8
repos/os/recipes/pkg/test-trace_logger/runtime
View File

@ -122,9 +122,9 @@
<start name="cpu_burner.1">
<binary name="cpu_burner"/>
<resource name="RAM" quantum="1M"/>
<configfile name="cpu_burner1.config"/>
<route>
<service name="ROM" label="cpu_burner1.config"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="config">
<child name="dynamic_rom" label="cpu_burner1.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
@ -132,9 +132,9 @@
<start name="cpu_burner.2">
<binary name="cpu_burner"/>
<resource name="RAM" quantum="1M"/>
<configfile name="cpu_burner2.config"/>
<route>
<service name="ROM" label="cpu_burner2.config"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="config">
<child name="dynamic_rom" label="cpu_burner2.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

3
repos/os/run/demo.run
View File

@ -150,9 +150,8 @@ install_config {
<start name="nitpicker" caps="110">
<resource name="RAM" quantum="1216K"/>
<provides><service name="Nitpicker"/></provides>
<configfile name="nitpicker.config"/>
<route>
<service name="ROM" label="nitpicker.config">
<service name="ROM" label="config">
<child name="nitpicker_config"/> </service>
<service name="ROM" label="focus">
<child name="report_rom"/> </service>

11
repos/os/run/input_filter.run
View File

@ -55,7 +55,7 @@ append config {
<resource name="RAM" quantum="2M"/>
<provides> <service name="ROM"/> <service name="Report"/> </provides>
<config>
<policy label_prefix="input_filter -> input_filter.config"
<policy label_prefix="input_filter -> config"
report="test-input_filter -> input_filter.config"/>
<policy label_prefix="input_filter -> chargen_include"
report="test-input_filter -> chargen_include"/>
@ -69,12 +69,11 @@ append config {
<start name="input_filter" priority="-1">
<resource name="RAM" quantum="2M"/>
<provides> <service name="Input"/> </provides>
<configfile name="input_filter.config"/>
<route>
<service name="ROM" label="input_filter.config"> <child name="report_rom"/> </service>
<service name="ROM" label="chargen_include"> <child name="report_rom"/> </service>
<service name="ROM" label="remap_include"> <child name="report_rom"/> </service>
<service name="ROM" label="capslock"> <child name="report_rom"/> </service>
<service name="ROM" label="config"> <child name="report_rom"/> </service>
<service name="ROM" label="chargen_include"> <child name="report_rom"/> </service>
<service name="ROM" label="remap_include"> <child name="report_rom"/> </service>
<service name="ROM" label="capslock"> <child name="report_rom"/> </service>
<service name="Input"> <child name="test-input_filter"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<any-service> <parent/> </any-service>

4
repos/os/run/mixer.run
View File

@ -120,11 +120,11 @@ append config {
<start name="mixer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Audio_out"/></provides>
<configfile name="mixer.config"/>
<route>
<service name="Audio_out"> <child name="audio_drv"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<service name="ROM" label="mixer.config"> <child name="dynamic_rom"/> </service>
<service name="ROM" label="config">
<child name="dynamic_rom" label="mixer.config"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

5
repos/os/run/pointer.run
View File

@ -177,10 +177,9 @@ set config {
<start name="shape-smiley">
<binary name="test-pointer"/>
<resource name="RAM" quantum="2M"/>
<configfile name="smiley.config"/>
<route>
<service name="ROM" label="smiley.config">
<child name="shape-smiley-config"/> </service>
<service name="ROM" label="config">
<child name="shape-smiley-config" label="smiley.config"/> </service>
<service name="Report" label="shape">
<child name="pointer" label="test-label-smiley -> shape"/>
</service>

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>