ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-30 16:14:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

depot_query.run: use label_last

Browse Source
This commit is contained in:
Norman Feske 2018-01-19 19:23:39 +01:00
parent 4619e2e84c
commit e6b87e9d20
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repos/gems/run/depot_query.run
View File

@ -1,4 +1,4 @@
build { app/depot_query app/depot_deploy } build { init app/depot_query app/depot_deploy }
create_boot_directory create_boot_directory
@ -88,10 +88,8 @@ install_config {
</parent-provides> </parent-provides>
</static> </static>
<common_routes> <common_routes>
<service name="ROM" unscoped_label="init"> <parent/> </service> <service name="ROM" label_last="ld.lib.so"> <parent/> </service>
<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service> <service name="ROM" label_last="init"> <parent/> </service>
<service name="ROM" label_suffix="init"> <parent/> </service>
<service name="ROM" label_suffix="ld.lib.so"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
@ -108,10 +106,8 @@ install_config {
<resource name="RAM" quantum="64M"/> <resource name="RAM" quantum="64M"/>
<binary name="init"/> <binary name="init"/>
<route> <route>
<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service> <service name="ROM" label_last="ld.lib.so"> <parent/> </service>
<service name="ROM" unscoped_label="init"> <parent/> </service> <service name="ROM" label_last="init"> <parent/> </service>
<service name="ROM" label_suffix="ld.lib.so"> <parent/> </service>
<service name="ROM" label_suffix="init"> <parent/> </service>
<service name="ROM" label="config"> <child name="report_rom"/> </service> <service name="ROM" label="config"> <child name="report_rom"/> </service>
<service name="ROM"> <child name="fs_rom"/> </service> <service name="ROM"> <child name="fs_rom"/> </service>
<service name="Timer"> <child name="timer"/> </service> <service name="Timer"> <child name="timer"/> </service>
@ -121,7 +117,7 @@ install_config {
</config>} </config>}
build_boot_image { depot_query depot_deploy } build_boot_image { init depot_query depot_deploy }
run_genode_until {.*child "test-fs_report" exited with exit value 0.*\n} 30 run_genode_until {.*child "test-fs_report" exited with exit value 0.*\n} 30

14
repos/gems/src/app/depot_deploy/main.cc
View File

@ -29,7 +29,7 @@ struct Depot_deploy::Main
Attached_rom_dataspace _config { _env, "config" }; Attached_rom_dataspace _config { _env, "config" };
Attached_rom_dataspace _blueprint { _env, "blueprint" }; Attached_rom_dataspace _blueprint { _env, "blueprint" };
Reporter _init_config_reporter { _env, "config", "init.config" }; Reporter _init_config_reporter { _env, "config", "init.config", 16*1024 };
Signal_handler<Main> _config_handler { Signal_handler<Main> _config_handler {
_env.ep(), *this, &Main::_handle_config }; _env.ep(), *this, &Main::_handle_config };
@ -143,6 +143,11 @@ void Depot_deploy::Main::_gen_start_node(Xml_generator &xml, Xml_node pkg, Xml_n
}); });
} }
/*
* Add common routes as defined in our config.
*/
xml.append(common.content_base(), common.content_size());
/* /*
* Add ROM routing rule with the label rewritten to * Add ROM routing rule with the label rewritten to
* the path within the depot. * the path within the depot.
@ -159,16 +164,11 @@ void Depot_deploy::Main::_gen_start_node(Xml_generator &xml, Xml_node pkg, Xml_n
xml.node("service", [&] () { xml.node("service", [&] () {
xml.attribute("name", "ROM"); xml.attribute("name", "ROM");
xml.attribute("label", label); xml.attribute("label_last", label);
xml.node("parent", [&] () { xml.node("parent", [&] () {
xml.attribute("label", path); }); xml.attribute("label", path); });
}); });
}); });
/*
* Add common routes as defined in our config.
*/
xml.append(common.content_base(), common.content_size());
}); });
} }