pistachio: symlink kernel files to bin/

This enables us to pick all relevant parts for assembling a binary
archive for the kernel from bin/.
This commit is contained in:
Norman Feske 2017-04-07 15:52:16 +02:00 committed by Christian Helmuth
parent e3e41e5ca0
commit ece67ca174
2 changed files with 18 additions and 16 deletions

View File

@ -68,11 +68,15 @@ clean cleanall:
# #
LIBS += syscall-pistachio LIBS += syscall-pistachio
$(TARGET): sigma0 kickstart $(TARGET): $(INSTALL_DIR)/sigma0-pistachio \
$(INSTALL_DIR)/kickstart-pistachio \
$(INSTALL_DIR)/pistachio
sigma0: $(INSTALL_DIR)/sigma0-pistachio:
$(VERBOSE)ln -sf $(LIB_CACHE_DIR)/syscall-pistachio/serv/sigma0/sigma0 $(VERBOSE)ln -sf $(LIB_CACHE_DIR)/syscall-pistachio/serv/sigma0/sigma0 $@
kickstart: $(INSTALL_DIR)/kickstart-pistachio:
$(VERBOSE)ln -sf $(LIB_CACHE_DIR)/syscall-pistachio/util/kickstart/kickstart $(VERBOSE)ln -sf $(LIB_CACHE_DIR)/syscall-pistachio/util/kickstart/kickstart $@
$(INSTALL_DIR)/pistachio: $(KERNEL_BUILD_DIR)/x86-kernel
$(VERBOSE)ln -sf $< $@

View File

@ -16,11 +16,9 @@ proc run_boot_dir {binaries} {
build_core_image $binaries build_core_image $binaries
exec mkdir -p [run_dir]/pistachio exec cp bin/pistachio [run_dir]/kernel
exec cp bin/sigma0-pistachio [run_dir]/sigma0
exec cp kernel/pistachio/kernel [run_dir]/pistachio exec cp bin/kickstart-pistachio [run_dir]/kickstart
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"]} { if {[have_include "image/iso"] || [have_include "image/disk"]} {
@ -39,9 +37,9 @@ proc run_boot_dir {binaries} {
puts $fh "timeout 0" puts $fh "timeout 0"
puts $fh "default 0" puts $fh "default 0"
puts $fh "\ntitle Genode on L4ka::Pistachio" puts $fh "\ntitle Genode on L4ka::Pistachio"
puts $fh " kernel /pistachio/kickstart" puts $fh " kernel /kickstart"
puts $fh " module /pistachio/kernel" puts $fh " module /kernel"
puts $fh " module /pistachio/sigma0" puts $fh " module /sigma0"
puts $fh " module /image.elf" puts $fh " module /image.elf"
close $fh close $fh
} }
@ -62,9 +60,9 @@ proc run_boot_dir {binaries} {
# #
set fh [open "[run_dir]/config-52-54-00-12-34-56" "WRONLY CREAT TRUNC"] set fh [open "[run_dir]/config-52-54-00-12-34-56" "WRONLY CREAT TRUNC"]
puts $fh " exec /boot/bender" puts $fh " exec /boot/bender"
puts $fh " load /pistachio/kickstart" puts $fh " load /kickstart"
puts $fh " load /pistachio/kernel" puts $fh " load /kernel"
puts $fh " load /pistachio/sigma0" puts $fh " load /sigma0"
puts $fh " load /image.elf" puts $fh " load /image.elf"
close $fh close $fh