Replace static "genodelabs" depot user with "[depot_user]" call

Use "depot_user" TCL procedure may be used in run scripts for tests not
related to downloading specific packages.

Fix #3170
This commit is contained in:
Ehmry - 2019-02-19 14:24:52 +01:00 committed by Christian Helmuth
parent 024630d6ad
commit bebbc87c3a
31 changed files with 248 additions and 248 deletions

View File

@ -12,18 +12,18 @@ if { ![have_spec pbxa9] && ![have_spec x86] } {
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/terminal \
genodelabs/src/init \
genodelabs/src/noux \
genodelabs/src/posix \
genodelabs/src/ram_fs \
genodelabs/src/log_terminal \
genodelabs/src/ncurses \
genodelabs/src/bash-minimal \
genodelabs/src/vim-minimal \
genodelabs/src/coreutils-minimal
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/terminal \
[depot_user]/src/init \
[depot_user]/src/noux \
[depot_user]/src/posix \
[depot_user]/src/ram_fs \
[depot_user]/src/log_terminal \
[depot_user]/src/ncurses \
[depot_user]/src/bash-minimal \
[depot_user]/src/vim-minimal \
[depot_user]/src/coreutils-minimal
set build_components { server/fs_log server/cpu_sampler test/cpu_sampler }

View File

@ -1,14 +1,14 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/src/init \
genodelabs/src/report_rom \
genodelabs/src/dynamic_rom \
genodelabs/src/nitpicker \
genodelabs/src/libc \
genodelabs/src/libpng \
genodelabs/src/zlib
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/src/init \
[depot_user]/src/report_rom \
[depot_user]/src/dynamic_rom \
[depot_user]/src/nitpicker \
[depot_user]/src/libc \
[depot_user]/src/libpng \
[depot_user]/src/zlib
install_config {
<config>

View File

@ -1,15 +1,15 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/src/init \
genodelabs/src/report_rom \
genodelabs/src/dynamic_rom \
genodelabs/src/nitpicker \
genodelabs/src/decorator \
genodelabs/src/libc \
genodelabs/src/libpng \
genodelabs/src/zlib
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/src/init \
[depot_user]/src/report_rom \
[depot_user]/src/dynamic_rom \
[depot_user]/src/nitpicker \
[depot_user]/src/decorator \
[depot_user]/src/libc \
[depot_user]/src/libpng \
[depot_user]/src/zlib
install_config {
<config>

View File

@ -6,27 +6,27 @@ if {![have_spec x86] || [have_spec linux]} {
exit 0
}
import_from_depot genodelabs/src/[base_src] \
genodelabs/src/report_rom \
genodelabs/src/fs_rom \
genodelabs/src/vfs \
genodelabs/src/vfs_lxip \
genodelabs/src/fetchurl \
genodelabs/src/libc \
genodelabs/src/libssh \
genodelabs/src/libssl \
genodelabs/src/libcrypto \
genodelabs/src/zlib \
genodelabs/src/curl \
genodelabs/src/init \
genodelabs/src/chroot \
genodelabs/src/acpi_drv \
genodelabs/src/ipxe_nic_drv \
genodelabs/src/platform_drv \
genodelabs/src/extract \
genodelabs/src/libarchive \
genodelabs/src/liblzma \
genodelabs/src/verify
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/report_rom \
[depot_user]/src/fs_rom \
[depot_user]/src/vfs \
[depot_user]/src/vfs_lxip \
[depot_user]/src/fetchurl \
[depot_user]/src/libc \
[depot_user]/src/libssh \
[depot_user]/src/libssl \
[depot_user]/src/libcrypto \
[depot_user]/src/zlib \
[depot_user]/src/curl \
[depot_user]/src/init \
[depot_user]/src/chroot \
[depot_user]/src/acpi_drv \
[depot_user]/src/ipxe_nic_drv \
[depot_user]/src/platform_drv \
[depot_user]/src/extract \
[depot_user]/src/libarchive \
[depot_user]/src/liblzma \
[depot_user]/src/verify
source ${genode_dir}/repos/base/run/platform_drv.inc

View File

@ -2,14 +2,14 @@ build { init app/depot_query app/depot_deploy }
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/src/report_rom \
genodelabs/src/fs_rom \
genodelabs/src/vfs \
genodelabs/src/init
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/report_rom \
[depot_user]/src/fs_rom \
[depot_user]/src/vfs \
[depot_user]/src/init
create_tar_from_depot_binaries [run_dir]/genode/depot.tar \
genodelabs/pkg/test-fs_report
[depot_user]/pkg/test-fs_report
proc query_pkg {} {
return test-fs_report/[_current_depot_archive_version pkg test-fs_report] }
@ -94,7 +94,7 @@ install_config {
<service name="LOG"> <parent/> </service>
<service name="Timer"> <parent/> </service>
</common_routes>
<start name="test" pkg="genodelabs/pkg/} [query_pkg] {"/>
<start name="test" pkg="} [depot_user] {/pkg/} [query_pkg] {"/>
</config>
<route>
<service name="ROM" label="blueprint"> <child name="report_rom"/> </service>

View File

@ -7,11 +7,11 @@ build { app/driver_manager test/driver_manager lib/ld }
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/drivers_managed-pc \
genodelabs/src/report_rom \
genodelabs/src/dynamic_rom \
genodelabs/src/init
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/drivers_managed-pc \
[depot_user]/src/report_rom \
[depot_user]/src/dynamic_rom \
[depot_user]/src/init
install_config {
<config prio_levels="2">

View File

@ -1,16 +1,16 @@
create_boot_directory
import_from_depot \
genodelabs/src/[base_src] \
genodelabs/src/coreutils \
genodelabs/src/bash \
genodelabs/src/init \
genodelabs/src/libc \
genodelabs/src/noux \
genodelabs/src/posix \
genodelabs/src/report_rom \
genodelabs/src/vfs \
genodelabs/src/vfs_import
[depot_user]/src/[base_src] \
[depot_user]/src/coreutils \
[depot_user]/src/bash \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/noux \
[depot_user]/src/posix \
[depot_user]/src/report_rom \
[depot_user]/src/vfs \
[depot_user]/src/vfs_import
install_config {
<config>

View File

@ -1,18 +1,18 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/motif_wm \
genodelabs/raw/genode_bg \
genodelabs/pkg/fonts_fs \
genodelabs/pkg/backdrop \
genodelabs/src/demo \
genodelabs/src/init \
genodelabs/src/nitpicker \
genodelabs/src/nit_fb \
genodelabs/src/nit_fader \
genodelabs/src/rom_filter \
genodelabs/src/menu_view
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/motif_wm \
[depot_user]/raw/genode_bg \
[depot_user]/pkg/fonts_fs \
[depot_user]/pkg/backdrop \
[depot_user]/src/demo \
[depot_user]/src/init \
[depot_user]/src/nitpicker \
[depot_user]/src/nit_fb \
[depot_user]/src/nit_fader \
[depot_user]/src/rom_filter \
[depot_user]/src/menu_view
install_config {
<config>

View File

@ -1,15 +1,15 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/fonts_fs \
genodelabs/src/init \
genodelabs/src/dynamic_rom \
genodelabs/src/report_rom \
genodelabs/src/nitpicker \
genodelabs/src/libc \
genodelabs/src/libpng \
genodelabs/src/zlib
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/fonts_fs \
[depot_user]/src/init \
[depot_user]/src/dynamic_rom \
[depot_user]/src/report_rom \
[depot_user]/src/nitpicker \
[depot_user]/src/libc \
[depot_user]/src/libpng \
[depot_user]/src/zlib
install_config {
<config>

View File

@ -20,10 +20,10 @@ if {[have_spec linux]} {
create_boot_directory
import_from_depot \
genodelabs/src/[base_src] \
genodelabs/src/init \
genodelabs/src/rtc_drv \
genodelabs/pkg/terminal \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/rtc_drv \
[depot_user]/pkg/terminal \
source ${genode_dir}/repos/base/run/platform_drv.inc

View File

@ -1,8 +1,8 @@
source ${genode_dir}/repos/libports/run/qt5_common.inc
import_from_depot genodelabs/src/dynamic_rom \
genodelabs/src/mixer_gui_qt \
genodelabs/src/qt5_widgets
import_from_depot [depot_user]/src/dynamic_rom \
[depot_user]/src/mixer_gui_qt \
[depot_user]/src/qt5_widgets
#
# Build

View File

@ -1,12 +1,12 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/raw/genode_bg \
genodelabs/pkg/backdrop \
genodelabs/src/init \
genodelabs/src/dynamic_rom \
genodelabs/src/nitpicker
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/raw/genode_bg \
[depot_user]/pkg/backdrop \
[depot_user]/src/init \
[depot_user]/src/dynamic_rom \
[depot_user]/src/nitpicker
append config {
<config>

View File

@ -1,11 +1,11 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/src/init \
genodelabs/src/dynamic_rom \
genodelabs/src/nitpicker \
genodelabs/src/demo
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/src/init \
[depot_user]/src/dynamic_rom \
[depot_user]/src/nitpicker \
[depot_user]/src/demo
install_config {
<config>

View File

@ -1,11 +1,11 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/src/init \
genodelabs/src/libc \
genodelabs/src/vfs \
genodelabs/raw/ttf-bitstream-vera-minimal
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/vfs \
[depot_user]/raw/ttf-bitstream-vera-minimal
install_config {
<config>

View File

@ -3,12 +3,12 @@ build { app/sequence server/vfs lib/vfs/import test/libc }
create_boot_directory
import_from_depot \
genodelabs/src/[base_src] \
genodelabs/src/coreutils \
genodelabs/src/init \
genodelabs/src/libc \
genodelabs/src/noux \
genodelabs/src/posix \
[depot_user]/src/[base_src] \
[depot_user]/src/coreutils \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/noux \
[depot_user]/src/posix \
install_config {
<config verbose="yes">

View File

@ -5,16 +5,16 @@ create_boot_directory
# 'pkg/motif_wm' with 'pkg/themed_wm'.
#
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/motif_wm \
genodelabs/raw/genode_bg \
genodelabs/pkg/backdrop \
genodelabs/src/demo \
genodelabs/src/init \
genodelabs/src/nitpicker \
genodelabs/src/nit_fb \
genodelabs/src/vfs
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/motif_wm \
[depot_user]/raw/genode_bg \
[depot_user]/pkg/backdrop \
[depot_user]/src/demo \
[depot_user]/src/init \
[depot_user]/src/nitpicker \
[depot_user]/src/nit_fb \
[depot_user]/src/vfs
install_config {
<config prio_levels="2">

View File

@ -1,7 +1,7 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/src/init
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init
install_config {
<config>

View File

@ -40,10 +40,10 @@ build $build_components
create_boot_directory
set depot_pkgs "genodelabs/src/[base_src] genodelabs/src/init"
set depot_pkgs "[depot_user]/src/[base_src] [depot_user]/src/init"
lappend_if $use_ahci depot_pkgs genodelabs/src/ahci_drv
lappend_if $use_ram_block depot_pkgs genodelabs/src/ram_block
lappend_if $use_ahci depot_pkgs [depot_user]/src/ahci_drv
lappend_if $use_ram_block depot_pkgs [depot_user]/src/ram_block
import_from_depot {*}$depot_pkgs

View File

@ -54,11 +54,11 @@ build $build_components
create_boot_directory
set depot_pkgs "genodelabs/src/[base_src] genodelabs/src/init"
set depot_pkgs "[depot_user]/src/[base_src] [depot_user]/src/init"
lappend_if $use_ahci depot_pkgs genodelabs/src/ahci_drv
lappend_if $use_ram_block depot_pkgs genodelabs/src/ram_block
lappend_if $use_vfs_server depot_pkgs genodelabs/src/vfs
lappend_if $use_ahci depot_pkgs [depot_user]/src/ahci_drv
lappend_if $use_ram_block depot_pkgs [depot_user]/src/ram_block
lappend_if $use_vfs_server depot_pkgs [depot_user]/src/vfs
import_from_depot {*}$depot_pkgs

View File

@ -20,9 +20,9 @@ if {[have_spec linux]} {
create_boot_directory
import_from_depot \
genodelabs/src/[base_src] \
genodelabs/src/init \
genodelabs/src/rtc_drv \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/rtc_drv \
source ${genode_dir}/repos/base/run/platform_drv.inc

View File

@ -7,11 +7,11 @@ build $build_components
create_boot_directory
import_from_depot \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/motif_wm \
genodelabs/src/[base_src] \
genodelabs/src/init \
genodelabs/src/nitpicker \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/motif_wm \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/nitpicker \
set config {
<config>

View File

@ -11,9 +11,9 @@ if {[have_spec linux]} {
create_boot_directory
import_from_depot \
genodelabs/src/[base_src] \
genodelabs/src/init \
genodelabs/src/rtc_drv \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/rtc_drv \
install_config {
<config>

View File

@ -11,9 +11,9 @@ if {[have_spec linux]} {
create_boot_directory
import_from_depot \
genodelabs/src/[base_src] \
genodelabs/src/init \
genodelabs/src/rtc_drv \
[depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/rtc_drv \
source ${genode_dir}/repos/base/run/platform_drv.inc

View File

@ -1,17 +1,17 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/terminal \
genodelabs/src/init \
genodelabs/src/libc \
genodelabs/src/noux \
genodelabs/src/posix \
genodelabs/src/ncurses \
genodelabs/src/vim \
genodelabs/src/bash \
genodelabs/src/coreutils \
genodelabs/src/ram_fs
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/terminal \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/noux \
[depot_user]/src/posix \
[depot_user]/src/ncurses \
[depot_user]/src/vim \
[depot_user]/src/bash \
[depot_user]/src/coreutils \
[depot_user]/src/ram_fs
# write default vimrc file
set vimrc_fd [open [run_dir]/genode/vimrc w]

View File

@ -3,20 +3,20 @@ set e2fsck [installed_command e2fsck]
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/src/init \
genodelabs/src/platform_drv \
genodelabs/src/report_rom \
genodelabs/src/acpi_drv \
genodelabs/src/ahci_drv \
genodelabs/src/vfs \
genodelabs/src/rump \
genodelabs/src/log_terminal \
genodelabs/src/noux \
genodelabs/src/libc \
genodelabs/src/posix \
genodelabs/src/bash \
genodelabs/src/coreutils
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/platform_drv \
[depot_user]/src/report_rom \
[depot_user]/src/acpi_drv \
[depot_user]/src/ahci_drv \
[depot_user]/src/vfs \
[depot_user]/src/rump \
[depot_user]/src/log_terminal \
[depot_user]/src/noux \
[depot_user]/src/libc \
[depot_user]/src/posix \
[depot_user]/src/bash \
[depot_user]/src/coreutils
source ${genode_dir}/repos/base/run/platform_drv.inc
set config {

View File

@ -5,14 +5,14 @@ if {!([have_spec nova])} {
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/terminal \
genodelabs/src/init \
genodelabs/src/libc \
genodelabs/src/noux \
genodelabs/src/posix \
genodelabs/src/ncurses
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/terminal \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/noux \
[depot_user]/src/posix \
[depot_user]/src/ncurses
source ${genode_dir}/repos/ports/run/noux_gdb.inc

View File

@ -15,19 +15,19 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/terminal \
genodelabs/src/init \
genodelabs/src/nitpicker \
genodelabs/src/nit_fb \
genodelabs/src/libc \
genodelabs/src/noux \
genodelabs/src/posix \
genodelabs/src/ncurses \
genodelabs/src/bash \
genodelabs/src/coreutils \
genodelabs/src/ram_fs
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/terminal \
[depot_user]/src/init \
[depot_user]/src/nitpicker \
[depot_user]/src/nit_fb \
[depot_user]/src/libc \
[depot_user]/src/noux \
[depot_user]/src/posix \
[depot_user]/src/ncurses \
[depot_user]/src/bash \
[depot_user]/src/coreutils \
[depot_user]/src/ram_fs
install_config {
<config verbose="yes">

View File

@ -9,19 +9,19 @@ if {[have_spec linux]} {
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/terminal \
genodelabs/src/init \
genodelabs/src/libc \
genodelabs/src/noux \
genodelabs/src/posix \
genodelabs/src/ncurses \
genodelabs/src/vim \
genodelabs/src/bash \
genodelabs/src/grep \
genodelabs/src/coreutils \
genodelabs/src/ram_fs
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/terminal \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/noux \
[depot_user]/src/posix \
[depot_user]/src/ncurses \
[depot_user]/src/vim \
[depot_user]/src/bash \
[depot_user]/src/grep \
[depot_user]/src/coreutils \
[depot_user]/src/ram_fs
# write default vimrc file

View File

@ -1,14 +1,14 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/pkg/[drivers_interactive_pkg] \
genodelabs/pkg/terminal \
genodelabs/src/init \
genodelabs/src/libc \
genodelabs/src/noux \
genodelabs/src/posix \
genodelabs/src/ncurses \
genodelabs/src/vim
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/terminal \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/noux \
[depot_user]/src/posix \
[depot_user]/src/ncurses \
[depot_user]/src/vim
install_config {
<config verbose="yes">

View File

@ -4,19 +4,19 @@ create_boot_directory
proc current_pkg { pkg } { return $pkg/[_current_depot_archive_version pkg $pkg] }
import_from_depot genodelabs/src/[base_src] \
genodelabs/src/report_rom \
genodelabs/src/fs_rom \
genodelabs/src/ram_fs \
genodelabs/src/vfs \
genodelabs/src/init \
genodelabs/src/ipxe_nic_drv \
genodelabs/src/acpi_drv \
genodelabs/src/platform_drv \
genodelabs/src/rtc_drv \
genodelabs/src/posix \
genodelabs/src/libc \
genodelabs/src/vfs_lxip \
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/report_rom \
[depot_user]/src/fs_rom \
[depot_user]/src/ram_fs \
[depot_user]/src/vfs \
[depot_user]/src/init \
[depot_user]/src/ipxe_nic_drv \
[depot_user]/src/acpi_drv \
[depot_user]/src/platform_drv \
[depot_user]/src/rtc_drv \
[depot_user]/src/posix \
[depot_user]/src/libc \
[depot_user]/src/vfs_lxip \
create_tar_from_depot_binaries [run_dir]/genode/depot.tar \
[depot_user]/pkg/nic_router-nat-dns \

View File

@ -1,9 +1,9 @@
create_boot_directory
import_from_depot genodelabs/src/[base_src] \
genodelabs/src/init \
genodelabs/src/report_rom \
genodelabs/src/libc
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/report_rom \
[depot_user]/src/libc
install_config {
<config>