tool/run: extract function to copy files

Issue #4073
This commit is contained in:
Tomasz Gajewski
2021-04-14 10:10:25 +02:00
committed by Norman Feske
parent 507a7789fb
commit f49ec5b171
21 changed files with 67 additions and 61 deletions

View File

@@ -27,9 +27,9 @@ proc run_boot_dir {binaries} {
if {[llength $targets]} { build $targets }
if {$kernel_arg != ""} {
file copy -force [pwd]/bin/fiasco [run_dir]/genode/fiasco
file copy -force [pwd]/bin/sigma0-fiasco [run_dir]/genode/sigma0-fiasco
file copy -force [pwd]/bin/bootstrap-fiasco [run_dir]/genode/bootstrap-fiasco
copy_file [pwd]/bin/fiasco [run_dir]/genode/fiasco
copy_file [pwd]/bin/sigma0-fiasco [run_dir]/genode/sigma0-fiasco
copy_file [pwd]/bin/bootstrap-fiasco [run_dir]/genode/bootstrap-fiasco
}
build_core_image $binaries
@@ -39,9 +39,9 @@ proc run_boot_dir {binaries} {
# we can remove [run_dir]/genode after the core image has been built.
#
exec mkdir -p [run_dir]/boot
file copy -force [run_dir]/genode/fiasco [run_dir]/boot/kernel
file copy -force [run_dir]/genode/sigma0-fiasco [run_dir]/boot/sigma0
file copy -force [run_dir]/genode/bootstrap-fiasco [run_dir]/boot/bootstrap
copy_file [run_dir]/genode/fiasco [run_dir]/boot/kernel
copy_file [run_dir]/genode/sigma0-fiasco [run_dir]/boot/sigma0
copy_file [run_dir]/genode/bootstrap-fiasco [run_dir]/boot/bootstrap
remove_genode_dir
exec mv [run_dir]/image.elf [run_dir]/boot/image.elf

View File

@@ -71,9 +71,9 @@ proc run_boot_dir_x86 {binaries} {
if {[llength $targets]} { build $targets }
if {$kernel_arg != ""} {
file copy -force [pwd]/bin/foc-[board] [run_dir]/genode/foc
file copy -force [pwd]/bin/sigma0-foc-[board] [run_dir]/genode/sigma0-foc
file copy -force [pwd]/bin/bootstrap-foc-[board] [run_dir]/genode/bootstrap-foc
copy_file [pwd]/bin/foc-[board] [run_dir]/genode/foc
copy_file [pwd]/bin/sigma0-foc-[board] [run_dir]/genode/sigma0-foc
copy_file [pwd]/bin/bootstrap-foc-[board] [run_dir]/genode/bootstrap-foc
}
build_core_image $binaries
@@ -83,9 +83,9 @@ proc run_boot_dir_x86 {binaries} {
# we can remove [run_dir]/genode after the core image has been built.
#
exec mkdir -p [run_dir]/boot
file copy -force [run_dir]/genode/foc [run_dir]/boot/kernel
file copy -force [run_dir]/genode/sigma0-foc [run_dir]/boot/sigma0
file copy -force [run_dir]/genode/bootstrap-foc [run_dir]/boot/bootstrap
copy_file [run_dir]/genode/foc [run_dir]/boot/kernel
copy_file [run_dir]/genode/sigma0-foc [run_dir]/boot/sigma0
copy_file [run_dir]/genode/bootstrap-foc [run_dir]/boot/bootstrap
remove_genode_dir
exec mv [run_dir]/image.elf [run_dir]/boot/image.elf

View File

@@ -55,9 +55,9 @@ proc run_boot_dir {binaries} {
set build_args "$bootstrap_arg $core_arg $ld_arg"
if {[llength $build_args]} { build $build_args }
if {$ld_arg != ""} { file copy -force bin/ld-hw.lib.so [run_dir]/genode/ld.lib.so }
if {$core_arg != ""} { file copy -force bin/core-hw-[board].a [run_dir]/genode/ }
if {$bootstrap_arg != ""} { file copy -force bin/bootstrap-hw-[board].o [run_dir]/genode/ }
if {$ld_arg != ""} { copy_file bin/ld-hw.lib.so [run_dir]/genode/ld.lib.so }
if {$core_arg != ""} { copy_file bin/core-hw-[board].a [run_dir]/genode/ }
if {$bootstrap_arg != ""} { copy_file bin/bootstrap-hw-[board].o [run_dir]/genode/ }
#
# Copy specified modules to the run directory, excluding core.

View File

@@ -35,7 +35,7 @@ proc run_boot_dir {binaries} {
build_initrd $binaries
file copy -force [genode_dir]/tool/boot/vmlinuz [run_dir]/vmlinuz
copy_file [genode_dir]/tool/boot/vmlinuz [run_dir]/vmlinuz
if {[have_include "image/iso"]} {
install_iso_bootloader_to_run_dir

View File

@@ -42,9 +42,9 @@ proc run_boot_dir {binaries} {
set targets "$kernel_arg $core_arg $ld_arg"
if {[llength $targets]} { build $targets }
if {$kernel_arg != ""} { file copy -force bin/hypervisor [run_dir]/genode/hypervisor }
if {$core_arg != ""} { file copy -force bin/core-nova.a [run_dir]/genode/core-nova.a }
if {$ld_arg != ""} { file copy -force bin/ld-nova.lib.so [run_dir]/genode/ld.lib.so }
if {$kernel_arg != ""} { copy_file bin/hypervisor [run_dir]/genode/hypervisor }
if {$core_arg != ""} { copy_file bin/core-nova.a [run_dir]/genode/core-nova.a }
if {$ld_arg != ""} { copy_file bin/ld-nova.lib.so [run_dir]/genode/ld.lib.so }
#
# Collect contents of the ISO image

View File

@@ -120,7 +120,7 @@ proc run_boot_dir {binaries} {
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg lib/ld/okl4 }
set targets "$kernel_arg $ld_arg"
if {[llength $targets]} { build $targets }
if {$kernel_arg != ""} { file copy -force bin/okl4 [run_dir]/genode/okl4 }
if {$kernel_arg != ""} { copy_file bin/okl4 [run_dir]/genode/okl4 }
build_core_image $binaries
exec mv [run_dir]/image.elf [run_dir].image

View File

@@ -26,9 +26,9 @@ proc run_boot_dir {binaries} {
if {[llength $targets]} { build $targets }
if {$kernel_arg != ""} {
file copy -force bin/pistachio [run_dir]/genode/pistachio
file copy -force bin/sigma0-pistachio [run_dir]/genode/sigma0-pistachio
file copy -force bin/kickstart-pistachio [run_dir]/genode/kickstart-pistachio
copy_file bin/pistachio [run_dir]/genode/pistachio
copy_file bin/sigma0-pistachio [run_dir]/genode/sigma0-pistachio
copy_file bin/kickstart-pistachio [run_dir]/genode/kickstart-pistachio
}
build_core_image $binaries
@@ -38,9 +38,9 @@ proc run_boot_dir {binaries} {
# we can remove [run_dir]/genode after the core image has been built.
#
exec mkdir -p [run_dir]/boot
file copy -force [run_dir]/genode/pistachio [run_dir]/boot/kernel
file copy -force [run_dir]/genode/sigma0-pistachio [run_dir]/boot/sigma0
file copy -force [run_dir]/genode/kickstart-pistachio [run_dir]/boot/kickstart
copy_file [run_dir]/genode/pistachio [run_dir]/boot/kernel
copy_file [run_dir]/genode/sigma0-pistachio [run_dir]/boot/sigma0
copy_file [run_dir]/genode/kickstart-pistachio [run_dir]/boot/kickstart
remove_genode_dir
exec mv [run_dir]/image.elf [run_dir]/boot/image.elf

View File

@@ -39,7 +39,7 @@ proc run_boot_dir {binaries} {
if {[llength $targets]} { build $targets }
if {$kernel_arg != ""} {
file copy -force [pwd]/bin/sel4-[board] [run_dir]/genode/sel4
copy_file [pwd]/bin/sel4-[board] [run_dir]/genode/sel4
}
build_core_image $binaries
@@ -49,7 +49,7 @@ proc run_boot_dir {binaries} {
# we can remove [run_dir]/genode after the core image has been built.
#
exec mkdir -p [run_dir]/boot
file copy -force [run_dir]/genode/sel4 [run_dir]/boot/sel4
copy_file [run_dir]/genode/sel4 [run_dir]/boot/sel4
remove_genode_dir
exec mv [run_dir]/image.elf [run_dir]/boot/image.elf