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

run: link all files in [run_dir]/genode to core

Browse Source 
This way, files copied from the depot are incorporated in addition to
the files explicitly specified as boot modules.

The patch also adds an automatic check for the validity of the XML
syntax of boot modules ending with '.config'.

Issue #2339
This commit is contained in:
Norman Feske
2017-04-03 15:39:36 +02:00
committed by Christian Helmuth
parent a196fc171a
commit 015d319fa7
9 changed files with 214 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tool/run/boot_dir/foc
View File

@@ -57,13 +57,34 @@ proc l4_bin_dir { } {
proc run_boot_dir_x86 {binaries} {
build { lib/ld/foc kernel/foc }
#
# Build kernel and dynamic linker on demand, if not yet present in
# '[run_dir]/genode/'
#
set kernel_arg ""
set ld_arg ""
if {![file exists [run_dir]/genode/foc]} { set kernel_arg "kernel/foc" }
if {![file exists [run_dir]/genode/ld.lib.so]} { set ld_arg "lib/ld/foc" }
set targets "$kernel_arg $ld_arg"
if {[llength $targets]} { build $targets }
if {$kernel_arg != ""} {
file copy -force [pwd]/bin/foc [run_dir]/genode/foc
file copy -force [pwd]/bin/sigma0-foc [run_dir]/genode/sigma0-foc
file copy -force [pwd]/bin/bootstrap-foc [run_dir]/genode/bootstrap-foc
}
build_core_image $binaries
file copy -force [pwd]/bin/foc [run_dir]/kernel
file copy -force [pwd]/bin/sigma0-foc [run_dir]/sigma0
file copy -force [pwd]/bin/bootstrap-foc [run_dir]/bootstrap
#
# Move kernel files to distinct location within the boot directory so that
# we can remove [run_dir]/genode after the core image has been built.
#
file copy -force [run_dir]/genode/foc [run_dir]/kernel
file copy -force [run_dir]/genode/sigma0-foc [run_dir]/sigma0
file copy -force [run_dir]/genode/bootstrap-foc [run_dir]/bootstrap
exec rm -r [run_dir]/genode
if {[have_include "image/iso"] || [have_include "image/disk"]} {