ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-20 06:07:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add [depot_user] to run tool builtins

Browse Source 
Now that the depot_user procedure has found use in the depot_autopilot
it has become a convention.

Fix #3127
This commit is contained in:
Emery Hemingway 2019-01-22 12:58:39 +01:00 committed by Norman Feske
parent 6154d9067e
commit f529871162
9 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repos/gems/run/depot_autopilot.run
View File

@ -138,7 +138,6 @@ proc autopilot_run_genode_until {{wait_for_re forever} {timeout_value 0} {runnin
## Utility procedures ## ## Utility procedures ##
######################## ########################
proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
# #

2
repos/gems/run/depot_deploy.run
View File

@ -1,7 +1,5 @@
create_boot_directory create_boot_directory
proc depot_user {} { return nfeske }
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \ [depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/src/report_rom \ [depot_user]/src/report_rom \

2
repos/gems/run/depot_download.run
View File

@ -51,8 +51,6 @@ set config {
append_platform_drv_config append_platform_drv_config
proc depot_user { } { return genodelabs }
proc depot_user_download { } { proc depot_user_download { } {
return [exec cat [genode_dir]/depot/[depot_user]/download] } return [exec cat [genode_dir]/depot/[depot_user]/download] }

2
repos/gems/run/leitzentrale.run
View File

@ -1,7 +1,5 @@
create_boot_directory create_boot_directory
proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \ [depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/fonts_fs \ [depot_user]/pkg/fonts_fs \

2
repos/gems/run/sculpt.run
View File

@ -3,8 +3,6 @@ if {![have_spec x86] || [have_spec linux]} {
exit 0 exit 0
} }
proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
if {[have_spec nova]} { if {[have_spec nova]} {
proc kernel_output { } { return "novga serial logmem" } proc kernel_output { } { return "novga serial logmem" }
} }

2
repos/libports/run/qt5_common.inc
View File

@ -1,6 +1,4 @@
proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
source ${genode_dir}/repos/libports/run/qt5_drivers.inc source ${genode_dir}/repos/libports/run/qt5_drivers.inc
set feature(Input) 1 set feature(Input) 1

2
repos/libports/run/qt5_core.run
View File

@ -1,7 +1,5 @@
create_boot_directory create_boot_directory
proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
import_from_depot [depot_user]/src/[base_src] \ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \ [depot_user]/src/init \
[depot_user]/src/libc \ [depot_user]/src/libc \

1
repos/ports/run/stubby_deploy.run
View File

@ -1,7 +1,6 @@
source ${genode_dir}/repos/base/run/platform_drv.inc source ${genode_dir}/repos/base/run/platform_drv.inc
create_boot_directory create_boot_directory
proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
proc current_pkg { pkg } { return $pkg/[_current_depot_archive_version pkg $pkg] } proc current_pkg { pkg } { return $pkg/[_current_depot_archive_version pkg $pkg] }

7
tool/run/depot.inc
View File

@ -238,6 +238,13 @@ proc _collect_from_depot { archives } {
} }
##
# Parse depot user from run tool arguments with a fallback to "genodelabs"
#
#
proc depot_user {} { return [get_cmd_arg --depot-user genodelabs] }
## ##
# Import binary and raw content of the specified depot archives into the run # Import binary and raw content of the specified depot archives into the run
# directory of the scenario # directory of the scenario