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

Disambiguate kernel-specific file names

Browse Source 
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:
Norman Feske
2016-12-10 01:30:38 +01:00
parent 3865ee7ccc
commit c450ddcb3d
258 changed files with 902 additions and 1489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
tool/run/boot_dir/fiasco
View File

@@ -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

155
tool/run/boot_dir/foc
View File

@@ -1,64 +1,28 @@
proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" }
proc binary_name_core_o { } { return "foc/core.o" }
proc binary_name_timer { } { return "foc_timer_drv" }
##
# Return the location of the Fiasco.OC user directory
#
proc l4_dir { } {
global _l4_dir
proc run_boot_string { } { return "\nL4 Bootstrapper" }
if {![info exists _l4_dir]} {
if {[file exists etc/foc.conf]} {
set _l4_dir [exec sed -n "/^L4_BUILD_DIR/s/^.*=\\s*//p" etc/foc.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 = <l4re-build-dir>' "
puts stderr "in <genode-build-dir>/etc/foc.conf'."
exit 1
}
}
return $_l4_dir
proc core_link_address { } {
if {[have_spec x86 ]} { return "0x01100000" }
if {[have_spec arndale ]} { return "0x80100000" }
if {[have_spec rpi ]} { return "0x00800000" }
if {[have_spec panda ]} { return "0xa0000000" }
if {[have_spec pbxa9 ]} { return "0x76000000" }
if {[have_spec odroid_x2]} { return "0x80100000" }
if {[have_spec imx53 ]} { return "0x70140000" }
puts stderr "Error: platform not supported, core link address unknown"
exit 1
}
##
# Return whether the l4-buid-directory is provided from the outside
#
proc l4_dir_external { } {
if {[l4_dir] == "[pwd]/l4"} { return 0 }
return 1
}
##
# Return the location of the Fiasco.OC kernel directory
#
proc fiasco { } {
global _fiasco
proc fiasco_serial_esc_arg { } { return "-serial_esc " }
if {![info exists _fiasco]} {
if {[file exists etc/foc.conf]} {
set _fiasco [exec sed -n "/^KERNEL/s/^.*=\\s*//p" etc/foc.conf]
if {[file exists $_fiasco]} { return $_fiasco }
}
# try to fall back to version hosted with the Genode build directory
set _fiasco "[pwd]/kernel/fiasco.oc/fiasco"
}
return $_fiasco
}
##
# Return whether fiasco kernel is provided from the outside
#
proc fiasco_external { } {
if {[fiasco] == "[pwd]/kernel/fiasco.oc/fiasco"} { return 0 }
return 1
}
##
# Reset the target system via the Fiasco.OC kernel debugger
@@ -72,57 +36,37 @@ proc reset_target { {spawn_id_arg -1} } {
}
proc bin_dir { } {
if {[have_spec x86_32]} { return "[l4_dir]/bin/x86_586" }
if {[have_spec x86_64]} { return "[l4_dir]/bin/amd64_K8" }
if {[have_spec arm_v7a]} { return "[l4_dir]/bin/arm_armv7a" }
if {[have_spec arm_v6]} { return "[l4_dir]/bin/arm_armv6" }
proc l4_build_dir { } { return "[pwd]/var/libcache/syscall-foc/build" }
proc kernel_binary { } { return "[pwd]/var/libcache/kernel-foc/build/fiasco" }
proc l4_bin_dir { } {
if {[have_spec x86_32]} { return "[l4_build_dir]/bin/x86_586" }
if {[have_spec x86_64]} { return "[l4_build_dir]/bin/amd64_K8" }
if {[have_spec arm_v7a]} { return "[l4_build_dir]/bin/arm_armv7a" }
if {[have_spec arm_v6]} { return "[l4_build_dir]/bin/arm_armv6" }
puts stderr "Error: Cannot determine bin directory"
exit 1
}
set fiasco_serial_esc_arg "-serial_esc "
proc core_link_address { } {
if {[have_spec x86 ]} { return "0x01100000" }
if {[have_spec arndale ]} { return "0x80100000" }
if {[have_spec rpi ]} { return "0x00800000" }
if {[have_spec panda ]} { return "0xa0000000" }
if {[have_spec pbxa9 ]} { return "0x76000000" }
if {[have_spec odroid_x2]} { return "0x80100000" }
if {[have_spec imx53 ]} { return "0x70140000" }
puts stderr "Error: platform not supported, core link address unknown"
exit 1
}
proc run_boot_dir_x86 {binaries} {
global fiasco_serial_esc_arg
exec mkdir -p [run_dir]/fiasco
set foc_targets { lib/ld/foc }
if {![fiasco_external] && ![file exists kernel]} { lappend foc_targets kernel }
if {![l4_dir_external]} {
if {![file exists bootstrap]} { lappend foc_targets bootstrap }
if {![file exists sigma0]} { lappend foc_targets sigma0 }
}
if {[llength $foc_targets] > 0} { build $foc_targets }
build { lib/ld/foc kernel/foc }
build_core_image $binaries
# assert existence of the L4 build directory
l4_dir
puts "using fiasco kernel [fiasco]"
exec cp [fiasco] [run_dir]/fiasco
puts "using sigma0/bootstrap at [l4_dir]"
exec cp [bin_dir]/l4f/sigma0 [run_dir]/fiasco
exec cp [bin_dir]/bootstrap [run_dir]/fiasco
exec mkdir [run_dir]/foc
exec cp [kernel_binary] [run_dir]/foc/kernel
exec cp [l4_bin_dir]/l4f/sigma0 [run_dir]/foc
exec cp [l4_bin_dir]/bootstrap [run_dir]/foc
if {[have_include "image/iso"] || [have_include "image/disk"]} {
#
# Install isolinux/GRUB files and bender
#
@@ -139,9 +83,9 @@ proc run_boot_dir_x86 {binaries} {
puts $fh "default 0"
puts $fh "\ntitle Genode on Fiasco.OC"
puts $fh " kernel /boot/bender"
puts $fh " module /fiasco/bootstrap"
puts $fh " module /fiasco/fiasco $fiasco_serial_esc_arg"
puts $fh " module /fiasco/sigma0"
puts $fh " module /foc/bootstrap"
puts $fh " module /foc/kernel [fiasco_serial_esc_arg]"
puts $fh " module /foc/sigma0"
puts $fh " module /image.elf"
close $fh
}
@@ -162,9 +106,9 @@ proc run_boot_dir_x86 {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"
puts $fh " load /fiasco/fiasco -serial_esc"
puts $fh " load /fiasco/sigma0"
puts $fh " load /foc/bootstrap"
puts $fh " load /foc/kernel -serial_esc"
puts $fh " load /foc/sigma0"
puts $fh " load /image.elf"
close $fh
@@ -179,12 +123,11 @@ proc run_boot_dir_x86 {binaries} {
}
proc run_boot_dir_arm {binaries} {
proc run_boot_dir_arm { binaries } {
global run_target
global fiasco_serial_esc_arg
build { lib/ld/foc kernel sigma0 bootstrap }
build { lib/ld/foc kernel/foc }
build_core_image $binaries
@@ -195,25 +138,24 @@ proc run_boot_dir_arm {binaries} {
puts $fh "modaddr 0x01100000\n"
puts $fh "entry genode"
puts $fh "kernel [fiasco] $fiasco_serial_esc_arg"
puts $fh "kernel [kernel_binary] [fiasco_serial_esc_arg]"
puts $fh "roottask image.elf"
close $fh
set gen_img_cmd "make -C [l4_dir]/source O=[l4_dir] E=genode "
set gen_img_cmd "make -C [l4_build_dir]/source O=[l4_build_dir] E=genode "
append gen_img_cmd "MODULES_LIST=[pwd]/[run_dir]/modules.list "
append gen_img_cmd "MODULE_SEARCH_PATH=[pwd]/[run_dir]:[file dirname [fiasco]]:[l4_dir] "
append gen_img_cmd "MODULE_SEARCH_PATH=[pwd]/[run_dir]:[pwd]:[l4_build_dir] "
append gen_img_cmd "SYSTEM_TARGET=[cross_dev_prefix] elfimage"
set pid [eval "spawn sh -c \"$gen_img_cmd\""]
expect { eof { } }
if {[lindex [wait $pid] end] != 0} {
puts stderr "Error: Single-image creation failed"
puts stderr "Error: single-image creation failed"
exit -4
}
exec cp [run_dir]/image.elf [run_dir]/core.elf
exec cp [bin_dir]/bootstrap.elf [run_dir]/image.elf
exec cp [l4_bin_dir]/bootstrap.elf [run_dir]/image.elf
run_image [run_dir]/image.elf
puts "\nboot image: [run_dir]/image.elf\n"
@@ -231,11 +173,6 @@ proc run_boot_dir_arm {binaries} {
}
proc run_boot_string { } {
return "\nL4 Bootstrapper"
}
##
# Populate boot directory with binaries on fiasco.OC
#

1
tool/run/boot_dir/hw
View File

@@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-hw.lib.so" }
proc binary_name_core_o { } { return "hw/core.o" }
proc binary_name_timer { } { return "hw_timer_drv" }

1
tool/run/boot_dir/linux
View File

@@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-linux.lib.so" }
proc binary_name_core { } { return "core-linux" }
proc binary_name_timer { } { return "linux_timer_drv" }

5
tool/run/boot_dir/nova
View File

@@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-nova.lib.so" }
proc binary_name_core_o { } { return "nova/core.o" }
proc binary_name_timer { } { return "nova_timer_drv" }
@@ -12,7 +13,7 @@ proc nova_kernel { } {
if {[file exists etc/nova.conf]} {
set _nova_kernel [exec sed -n "/^NOVA_KERNEL/s/^.*=\\s*//p" etc/nova.conf]
} else {
set _nova_kernel "[pwd]/kernel/hypervisor"
set _nova_kernel "[pwd]/kernel/nova/hypervisor"
}
}
return $_nova_kernel
@@ -23,7 +24,7 @@ proc nova_kernel { } {
# Return whether nova is provided from the outside
#
proc nova_external { } {
if {[nova_kernel] == "[pwd]/kernel/hypervisor"} { return 0 }
if {[nova_kernel] == "[pwd]/kernel/nova/hypervisor"} { return 0 }
return 1
}

16
tool/run/boot_dir/okl4
View File

@@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-okl4.lib.so" }
proc binary_name_core_o { } { return "okl4/core.o" }
proc binary_name_timer { } { return "pit_timer_drv" }
@@ -27,15 +28,6 @@ proc okl4_dir { } {
}
##
# Return the location of the OKL4 kernel
#
proc okl4 { } {
if {[okl4_external]} { return [okl4_dir]/build/pistachio/bin/kernel }
return bin/kernel
}
##
# Return whether okl4 kernel is provided from the outside
#
@@ -129,8 +121,8 @@ proc run_boot_dir {binaries} {
# the kernel does not stand in the way of the everyday's work flow of
# executing run scripts as quick as possible.
#
if {![okl4_external] && ![file exists [okl4]]} {
build { lib/ld/okl4 kernel }
if {![okl4_external] && ![file exists bin/okl4]} {
build { lib/ld/okl4 kernel/okl4 }
} else {
build { lib/ld/okl4 }
}
@@ -138,7 +130,7 @@ proc run_boot_dir {binaries} {
build_core_image $binaries
exec mv [run_dir]/image.elf [run_dir].image
exec cp [okl4] [run_dir]/kernel
exec cp bin/okl4 [run_dir]/kernel
#
# Generate ELF weaver config

71
tool/run/boot_dir/pistachio
View File

@@ -1,7 +1,12 @@
proc binary_name_ld_lib_so { } { return "ld-pistachio.lib.so" }
proc binary_name_core_o { } { return "pistachio/core.o" }
proc binary_name_timer { } { return "pistachio_timer_drv" }
proc run_boot_string { } { return "\n\r\033\\\[1m\033\\\[33mL4Ka::Pistachio -" }
proc core_link_address { } { return "0x02000000" }
##
# Install files needed to boot via PXE
#
@@ -11,79 +16,23 @@ proc install_pxe_bootloader_to_run_dir { } {
}
##
# Read the location of the Pistachio user directory from 'etc/pistachio.conf'
#
proc pistachio_user_dir { } {
global _pistachio_user_dir
if {![info exists _pistachio_user_dir]} {
if {[file exists etc/pistachio.conf]} {
set _pistachio_user_dir [exec sed -n "/^PISTACHIO_USER_BUILD_DIR/s/^.*=\\s*//p" etc/pistachio.conf]
} else {
set _pistachio_user_dir "[pwd]/l4"
}
}
return $_pistachio_user_dir
}
##
# Read the location of the Pistachio kernel directory from 'etc/pistachio.conf'
# or return a good heuristic
#
proc pistachio_kernel { } {
global _pistachio_kernel
if {![info exists _pistachio_kernel]} {
if {[file exists etc/pistachio.conf]} {
set _pistachio_kernel [exec sed -n "/^PISTACHIO_KERNEL/s/^.*=\\s*//p" etc/pistachio.conf]
if {$_pistachio_kernel == ""} {
set _pistachio_kernel [file dirname [file dirname [pistachio_user_dir]]]/kernel/build/x86-kernel
}
} else {
set _pistachio_kernel "[pwd]/bin/kernel"
}
}
return $_pistachio_kernel
}
##
# Return whether the kernel is provided from the outside
#
proc kernel_external { } {
if {[pistachio_kernel] == "[pwd]/bin/kernel"} { return 0 }
return 1
}
proc run_boot_string { } {
return "\n\r\033\\\[1m\033\\\[33mL4Ka::Pistachio -"
}
proc core_link_address { } { return "0x02000000" }
##
# Populdate boot directory with binaries on pistachio
#
proc run_boot_dir {binaries} {
if {![kernel_external] && ![file exists [pistachio_kernel]]} {
build { lib/ld/pistachio kernel }
} else {
build { lib/ld/pistachio }
}
build { lib/ld/pistachio kernel/pistachio }
build_core_image $binaries
exec mkdir -p [run_dir]/pistachio
exec cp [pistachio_kernel] [run_dir]/pistachio/kernel
exec cp [pistachio_user_dir]/serv/sigma0/sigma0 [run_dir]/pistachio
exec cp [pistachio_user_dir]/util/kickstart/kickstart [run_dir]/pistachio
exec cp kernel/pistachio/kernel [run_dir]/pistachio
exec cp kernel/pistachio/sigma0 [run_dir]/pistachio
exec cp kernel/pistachio/kickstart [run_dir]/pistachio
if {[have_include "image/iso"] || [have_include "image/disk"]} {
#
# Install isolinux/GRUB files and bender
#

3
tool/run/boot_dir/sel4
View File

@@ -1,4 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-sel4.lib.so" }
proc binary_name_core_o { } { return "sel4/core.o" }
proc binary_name_timer { } { return "pit_timer_drv" }
@@ -12,7 +13,7 @@ proc core_link_address { } { return "0x02000000" }
proc run_boot_dir {binaries} {
# build sel4 kernel
build { lib/ld/sel4 kernel }
build { lib/ld/sel4 kernel/sel4 }
exec cp bin/sel4 [run_dir]/sel4
build_core_image $binaries

6
tool/run/run
View File

@@ -775,11 +775,13 @@ proc build_core_image {binaries} {
copy_and_strip_genode_binaries_to_run_dir $modules
lappend modules "config"
set core_obj core/[kernel_specific_binary core.o]
# create core binary without modules for debugging
build_core core/core.o {} [run_dir].core
build_core $core_obj {} [run_dir].core
# create core binary containing the boot modules
build_core core/core.o $modules [run_dir]/image.elf
build_core $core_obj $modules [run_dir]/image.elf
exec [cross_dev_prefix]strip [run_dir]/image.elf
}