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

Remove use of <configfile> feature of init

Browse Source 
Issue genodelabs/genode#3753
This commit is contained in:
Norman Feske
2020-05-08 17:08:48 +02:00
parent 98f052076f
commit 323ab9932e
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
recipes/pkg/sdl_vnc/runtime
View File

@@ -39,7 +39,6 @@
<start name="sdl_vnc" caps="150"> <start name="sdl_vnc" caps="150">
<resource name="RAM" quantum="36M"/> <resource name="RAM" quantum="36M"/>
<configfile name="sdl_vnc.config"/>
<!-- <!--
<config> <config>
<arg value="sdlvncviewer"/> <arg value="sdlvncviewer"/>
@@ -55,7 +54,7 @@
</config> </config>
--> -->
<route> <route>
<service name="ROM" label="sdl_vnc.config"> <service name="ROM" label="config">
<child name="fs_rom" label="config"/> </service> <child name="fs_rom" label="config"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>

4
run/audio_player.run
View File

@@ -129,9 +129,9 @@ append config {
<start name="audio_player" caps="150"> <start name="audio_player" caps="150">
<resource name="RAM" quantum="24M"/> <resource name="RAM" quantum="24M"/>
<configfile name="audio_player.config"/>
<route> <route>
<service name="ROM" label="audio_player.config"> <child name="dynamic_rom"/> </service> <service name="ROM" label="config">
<child name="dynamic_rom" label="audio_player.config"/> </service>
<service name="ROM" label="playlist"> <child name="dynamic_rom"/> </service> <service name="ROM" label="playlist"> <child name="dynamic_rom"/> </service>
<service name="Report"> <child name="report_rom"/> </service> <service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>

24
run/log_fader.run
View File

@@ -25,7 +25,6 @@ set build_components {
server/nit_fb server/nit_fb
server/nitpicker server/nitpicker
server/rom_filter server/rom_filter
server/terminal
server/terminal_log server/terminal_log
test/nitpicker test/nitpicker
} }
@@ -34,6 +33,9 @@ build $build_components
create_boot_directory create_boot_directory
import_from_depot [depot_user]/raw/ttf-bitstream-vera-minimal \
[depot_user]/pkg/terminal
# #
# Generate config # Generate config
# #
@@ -137,10 +139,8 @@ append config {
<start name="nitpicker"> <start name="nitpicker">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Nitpicker"/></provides> <provides><service name="Nitpicker"/></provides>
<configfile name="nitpicker.config"/>
<route> <route>
<service name="ROM" label="nitpicker.config"> <service name="ROM" label="config"> <child name="nitpicker_config"/> </service>
<child name="nitpicker_config"/> </service>
<service name="Framebuffer"> <child name="fb_drv" /> </service> <service name="Framebuffer"> <child name="fb_drv" /> </service>
<service name="Input"> <child name="input_drv" /> </service> <service name="Input"> <child name="input_drv" /> </service>
<service name="Report"> <child name="report_rom" /> </service> <service name="Report"> <child name="report_rom" /> </service>
@@ -205,11 +205,9 @@ append config {
<binary name="nit_fader"/> <binary name="nit_fader"/>
<resource name="RAM" quantum="5M"/> <resource name="RAM" quantum="5M"/>
<provides> <service name="Nitpicker"/> </provides> <provides> <service name="Nitpicker"/> </provides>
<configfile name="log_fader.config" />
<route> <route>
<service name="ROM" label="log_fader.config"> <service name="ROM" label="config">
<child name="log_fader_config" /> <child name="log_fader_config" /> </service>
</service>
<service name="Nitpicker"> <child name="nitpicker" /> </service> <service name="Nitpicker"> <child name="nitpicker" /> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
@@ -231,7 +229,14 @@ append config {
<resource name="RAM" quantum="3M"/> <resource name="RAM" quantum="3M"/>
<provides><service name="Terminal"/></provides> <provides><service name="Terminal"/></provides>
<config> <config>
<font size="8"/> <vfs>
<rom name="VeraMono.ttf"/>
<dir name="fonts">
<dir name="monospace">
<ttf name="regular" path="/VeraMono.ttf" size_px="16"/>
</dir>
</dir>
</vfs>
</config> </config>
<route> <route>
<service name="Input"> <child name="log_fb"/> </service> <service name="Input"> <child name="log_fb"/> </service>
@@ -292,7 +297,6 @@ set boot_modules {
report_rom report_rom
rom_filter rom_filter
rom_logger rom_logger
terminal
terminal_log terminal_log
testnit testnit
timer timer