mirror of
https://github.com/mmueller41/genode.git
synced 2026-01-21 12:32:56 +01:00
Disambiguate kernel-specific file names
This patch removes possible ambiguities with respect to the naming of kernel-dependent binaries and libraries. It also removes the use of kernel-specific global side effects from the build system. The reach of kernel-specific peculiarities has thereby become limited to the actual users of the respective 'syscall-<kernel>' libraries. Kernel-specific build artifacts are no longer generated at magic places within the build directory (like okl4's includes, or the L4 build directories of L4/Fiasco and Fiasco.OC, or the build directories of various kernels). Instead, such artifacts have been largely moved to the libcache. E.g., the former '<build-dir>/l4/' build directory for the L4 build system resides at '<build-dir>/var/libcache/syscall-foc/build/'. This way, the location is unique to the kernel. Note that various tools are still generated somewhat arbitrarily under '<build-dir>/tool/' as there is no proper formalism for building host tools yet. As the result of this work, it has become possible to use a joint Genode build directory that is usable with all kernels of a given hardware platform. E.g., on x86_32, one can now seamlessly switch between linux, nova, sel4, okl4, fiasco, foc, and pistachio without rebuilding any components except for core, the kernel, the dynamic linker, and the timer driver. At the current stage, such a build directory must still be created manually. A change of the 'create_builddir' tool will follow to make this feature easily available. This patch also simplifies various 'run/boot_dir' plugins by removing the option for an externally hosted kernel. This option remained unused for many years now. Issue #2190
This commit is contained in:
@@ -1,55 +1,11 @@
|
||||
proc binary_name_ld_lib_so { } { return "ld-fiasco.lib.so" }
|
||||
proc binary_name_core_o { } { return "fiasco/core.o" }
|
||||
proc binary_name_timer { } { return "fiasco_timer_drv" }
|
||||
|
||||
|
||||
##
|
||||
# Read the location of the Fiasco user directory from 'etc/fiasco.conf'
|
||||
#
|
||||
proc l4_dir { } {
|
||||
global _l4_dir
|
||||
|
||||
if {![info exists _l4_dir]} {
|
||||
if {[file exists etc/fiasco.conf]} {
|
||||
set _l4_dir [exec sed -n "/^L4_BUILD_DIR/s/^.*=\\s*//p" etc/fiasco.conf]
|
||||
if {[file exists $_l4_dir]} { return $_l4_dir }
|
||||
}
|
||||
|
||||
set _l4_dir "[pwd]/l4"
|
||||
if {![file exists $_l4_dir]} {
|
||||
puts -nonewline stderr "Error: Could neither find the L4 build directory "
|
||||
puts -nonewline stderr "within '<genode-build-dir>/l4' nor at a location "
|
||||
puts -nonewline stderr "specified via 'L4_BUILD_DIR = <l4v2-build-dir>' "
|
||||
puts stderr "in <genode-build-dir>/etc/fiasco.conf'."
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
return $_l4_dir
|
||||
}
|
||||
|
||||
|
||||
##
|
||||
# Return the location of the Fiasco kernel
|
||||
#
|
||||
proc fiasco { } {
|
||||
return [kernel_location_from_config_file etc/fiasco.conf [pwd]/kernel/fiasco/fiasco]
|
||||
}
|
||||
|
||||
|
||||
proc bin_dir { } {
|
||||
if {[have_spec x86_32]} { return "[l4_dir]/bin/x86_586" }
|
||||
|
||||
puts stderr "Error: Cannot determine bin directory"
|
||||
exit 1
|
||||
}
|
||||
|
||||
set fiasco_serial_esc_arg "-serial_esc "
|
||||
|
||||
|
||||
proc run_boot_string { } {
|
||||
return "\nL4 Bootstrapper"
|
||||
}
|
||||
|
||||
proc core_link_address { } { return "0x01000000" }
|
||||
proc fiasco_serial_esc_arg { } { return "-serial_esc " }
|
||||
proc run_boot_string { } { return "\nL4 Bootstrapper" }
|
||||
proc core_link_address { } { return "0x01000000" }
|
||||
|
||||
|
||||
##
|
||||
@@ -57,24 +13,17 @@ proc core_link_address { } { return "0x01000000" }
|
||||
#
|
||||
proc run_boot_dir {binaries} {
|
||||
|
||||
build { lib/ld/fiasco kernel bootstrap sigma0 }
|
||||
build { lib/ld/fiasco kernel/fiasco }
|
||||
|
||||
build_core_image $binaries
|
||||
|
||||
global fiasco_serial_esc_arg
|
||||
|
||||
exec mkdir -p [run_dir]/fiasco
|
||||
|
||||
# assert existence of the L4 build directory
|
||||
l4_dir
|
||||
|
||||
puts "using fiasco kernel [fiasco]"
|
||||
exec cp [fiasco] [run_dir]/fiasco/fiasco
|
||||
puts "using sigma0/bootstrap at [l4_dir]"
|
||||
exec cp [bin_dir]/l4v2/sigma0 [run_dir]/fiasco
|
||||
exec cp [bin_dir]/bootstrap [run_dir]/fiasco
|
||||
exec cp kernel/fiasco/kernel [run_dir]/fiasco
|
||||
exec cp kernel/fiasco/sigma0 [run_dir]/fiasco
|
||||
exec cp kernel/fiasco/bootstrap [run_dir]/fiasco
|
||||
|
||||
if {[have_include "image/iso"] || [have_include "image/disk"]} {
|
||||
|
||||
#
|
||||
# Install isolinux/GRUB files and bender
|
||||
#
|
||||
@@ -92,7 +41,7 @@ proc run_boot_dir {binaries} {
|
||||
puts $fh "\ntitle Genode on L4/Fiasco"
|
||||
puts $fh " kernel /boot/bender"
|
||||
puts $fh " module /fiasco/bootstrap -serial"
|
||||
puts $fh " module /fiasco/fiasco -serial -jdb_cmd=JH $fiasco_serial_esc_arg"
|
||||
puts $fh " module /fiasco/kernel -serial -jdb_cmd=JH [fiasco_serial_esc_arg]"
|
||||
puts $fh " module /fiasco/sigma0"
|
||||
puts $fh " module /image.elf"
|
||||
puts $fh " vbeset 0x117 506070"
|
||||
@@ -113,7 +62,7 @@ proc run_boot_dir {binaries} {
|
||||
set fh [open "[run_dir]/config-52-54-00-12-34-56" "WRONLY CREAT TRUNC"]
|
||||
puts $fh " exec /boot/bender"
|
||||
puts $fh " load /fiasco/bootstrap -serial"
|
||||
puts $fh " load /fiasco/fiasco -serial -serial_esc -jdb_cmd=JH"
|
||||
puts $fh " load /fiasco/kernel -serial -serial_esc -jdb_cmd=JH"
|
||||
puts $fh " load /fiasco/sigma0"
|
||||
puts $fh " load /image.elf"
|
||||
close $fh
|
||||
|
||||
Reference in New Issue
Block a user