mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-26 17:01:07 +00:00
4b46abf813
This patch removes the detection of statically linked executables from
the base framework. It thereby fixes the corner cases encountered with
Sculpt when obtaining the binaries of the runtime from the depot_rom
service that is hosted within the runtime.
Statically linked binaries and hybrid Linux/Genode (lx_hybrid) binaries
can still be started by relabeling the ROM-session route of "ld.lib.so"
to the binary name, pretending that the binary is the dynamic linker.
This can be achieved via init's label rewriting mechanism:
<route>
<service name="ROM" unscoped_label="ld.lib.so">
<parent label="test-platform"/> </service>
</route>
However, as this is quite cryptic and would need to be applied for all
lx_hybrid components, the patch adds a shortcut to init's configuration.
One can simply add the 'ld="no"' attribute to the <start> node of the
corresponding component:
<start name="test-platform" ld="no"/>
Fixes #2866
340 lines
9.7 KiB
Plaintext
340 lines
9.7 KiB
Plaintext
set use_net 0
|
|
set use_ps2 [have_spec ps2]
|
|
set use_usb 0
|
|
set use_serial 1
|
|
|
|
set use_vbox4 0
|
|
set use_vbox5 [expr !$use_vbox4]
|
|
|
|
# use_gui starts two VMs
|
|
set use_gui 0
|
|
# need a nic bridge for 2 VMs
|
|
set use_bridge [expr $use_net && $use_gui]
|
|
|
|
set build_components {
|
|
core init
|
|
drivers/framebuffer
|
|
drivers/timer
|
|
}
|
|
|
|
if {$use_vbox4} {
|
|
append build_components virtualbox
|
|
set virtualbox_binary "virtualbox-rem"
|
|
if {[have_spec muen]} { set virtualbox_binary "virtualbox-muen" }
|
|
if {[have_spec nova]} { set virtualbox_binary "virtualbox-nova" }
|
|
} else {
|
|
append build_components virtualbox5
|
|
set virtualbox_binary "virtualbox5-rem"
|
|
if {[have_spec nova]} { set virtualbox_binary "virtualbox5-nova" }
|
|
}
|
|
|
|
source ${genode_dir}/repos/base/run/platform_drv.inc
|
|
# override defaults of platform_drv.inc
|
|
proc platform_drv_priority {} { return { priority="-1"} }
|
|
|
|
lappend_if [expr $use_ps2] build_components drivers/input
|
|
lappend_if [expr $use_usb] build_components drivers/usb
|
|
lappend_if [expr $use_serial] build_components server/log_terminal
|
|
lappend_if [have_spec x86] build_components drivers/rtc
|
|
|
|
lappend_if [expr $use_net] build_components drivers/nic
|
|
lappend_if [expr $use_bridge] build_components server/nic_bridge
|
|
|
|
lappend_if [expr $use_gui] build_components server/report_rom
|
|
lappend_if [expr $use_gui] build_components server/nitpicker
|
|
lappend_if [expr $use_gui] build_components server/nit_fb
|
|
lappend_if [expr $use_gui] build_components app/pointer
|
|
|
|
append_platform_drv_build_components
|
|
|
|
build $build_components
|
|
|
|
create_boot_directory
|
|
|
|
set config {
|
|
<config prio_levels="4">
|
|
<parent-provides>
|
|
<service name="ROM"/>
|
|
<service name="IRQ"/>
|
|
<service name="IO_MEM"/>
|
|
<service name="IO_PORT"/>
|
|
<service name="PD"/>
|
|
<service name="RM"/>
|
|
<service name="CPU"/>
|
|
<service name="LOG"/>}
|
|
|
|
append_if [have_spec muen] config {
|
|
<service name="VM"/>}
|
|
|
|
append config {
|
|
</parent-provides>
|
|
<default-route>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</default-route>
|
|
<default caps="100"/>
|
|
<start name="timer">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides><service name="Timer"/></provides>
|
|
</start>}
|
|
|
|
append_platform_drv_config
|
|
|
|
append_if [expr $use_ps2] config {
|
|
<start name="ps2_drv" priority="-1">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides><service name="Input"/></provides>
|
|
</start>}
|
|
|
|
append_if [expr $use_usb] config {
|
|
<start name="usb_drv" priority="-1" caps="120">
|
|
<resource name="RAM" quantum="7M"/>
|
|
<provides><service name="Input"/></provides>}
|
|
|
|
append_if [expr $use_usb && ![have_spec muen]] config {
|
|
<config uhci="yes" ehci="yes" xhci="yes">}
|
|
|
|
append_if [expr $use_usb && [have_spec muen]] config {
|
|
<config uhci="no" ehci="no" xhci="yes">}
|
|
|
|
append_if [expr $use_usb] config {
|
|
<hid/>
|
|
</config>
|
|
</start>}
|
|
|
|
append_if [have_spec framebuffer] config {
|
|
<start name="fb_drv" priority="-1" caps="150">
|
|
<resource name="RAM" quantum="4M"/>
|
|
<provides><service name="Framebuffer"/></provides>
|
|
</start>}
|
|
|
|
append_if [have_spec sdl] config {
|
|
<start name="fb_sdl" priority="-1" ld="no">
|
|
<resource name="RAM" quantum="4M"/>
|
|
<provides>
|
|
<service name="Input"/>
|
|
<service name="Framebuffer"/>
|
|
</provides>
|
|
</start>}
|
|
|
|
append_if [have_spec x86] config {
|
|
<start name="rtc_drv" priority="-1">
|
|
<resource name="RAM" quantum="1M"/>
|
|
<provides>
|
|
<service name="Rtc"/>
|
|
</provides>
|
|
</start>}
|
|
|
|
append_if [expr $use_net] config {
|
|
<start name="nic_drv" priority="-1">
|
|
<resource name="RAM" quantum="4M"/>
|
|
<provides><service name="Nic"/></provides>
|
|
</start>
|
|
}
|
|
|
|
append_if [expr $use_serial] config {
|
|
<start name="log_terminal" priority="-1">
|
|
<resource name="RAM" quantum="2M"/>
|
|
<provides>
|
|
<service name="Terminal"/>
|
|
</provides>
|
|
</start>
|
|
}
|
|
|
|
append_if [expr $use_bridge] config {
|
|
<start name="nic_bridge" priority="-1">
|
|
<resource name="RAM" quantum="6M"/>
|
|
<provides><service name="Nic"/></provides>
|
|
<config/>
|
|
<route>
|
|
<service name="Nic"><child name="nic_drv"/></service>
|
|
<any-service><parent/></any-service>
|
|
</route>
|
|
</start>
|
|
}
|
|
|
|
append_if [expr $use_gui] config {
|
|
<start name="report_rom" priority="-1">
|
|
<resource name="RAM" quantum="2M"/>
|
|
<provides> <service name="Report"/> <service name="ROM"/> </provides>
|
|
<config>
|
|
<policy label="pointer -> hover" report="nitpicker -> hover"/>
|
|
<policy label="pointer -> xray" report="nitpicker -> xray"/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="nitpicker" priority="-1">
|
|
<resource name="RAM" quantum="4M"/>
|
|
<provides><service name="Nitpicker"/></provides>
|
|
<route>
|
|
<service name="Framebuffer"> <child name="fb_drv" /> </service>
|
|
<service name="Report"> <child name="report_rom" /> </service>}
|
|
|
|
append_if [expr ($use_gui && $use_ps2)] config {
|
|
<service name="Input"> <child name="ps2_drv"/> </service>}
|
|
append_if [expr ($use_gui && $use_usb)] config {
|
|
<service name="Input"> <child name="usb_drv"/> </service>}
|
|
|
|
append_if [expr $use_gui] config {
|
|
<any-service> <parent/> <any-child /> </any-service>
|
|
</route>
|
|
<config>
|
|
<report focus="yes" hover="yes" xray="yes" />
|
|
|
|
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
|
|
<domain name="" layer="2" content="client" focus="click" hover="always" />
|
|
|
|
<policy label_prefix="pointer" domain="pointer"/>
|
|
<default-policy domain=""/>
|
|
</config>
|
|
</start>
|
|
|
|
<start name="pointer" priority="-1">
|
|
<resource name="RAM" quantum="2M"/>
|
|
<config shapes="yes"/>
|
|
<route>
|
|
<service name="Nitpicker"> <child name="nitpicker"/> </service>
|
|
<service name="ROM" label="hover"> <child name="report_rom"/> </service>
|
|
<service name="ROM" label="xray"> <child name="report_rom"/> </service>
|
|
<any-service> <parent/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="nit_fb1" priority="-1">
|
|
<binary name="nit_fb"/>
|
|
<resource name="RAM" quantum="8M" />
|
|
<provides>
|
|
<service name="Framebuffer" />
|
|
<service name="Input" />
|
|
</provides>
|
|
|
|
<config xpos="10" ypos="10" width="1024" height="768"/>
|
|
|
|
<route>
|
|
<service name="Nitpicker"> <child name="nitpicker"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="nit_fb2" priority="-1">
|
|
<binary name="nit_fb"/>
|
|
<resource name="RAM" quantum="8M" />
|
|
<provides>
|
|
<service name="Framebuffer" />
|
|
<service name="Input" />
|
|
</provides>
|
|
<config xpos="410" ypos="310" width="1024" height="768"/>
|
|
<route>
|
|
<service name="Nitpicker"> <child name="nitpicker"/> </service>
|
|
<any-service> <parent/> <any-child/> </any-service>
|
|
</route>
|
|
</start>
|
|
|
|
<start name="vbox2" priority="-2" caps="500">}
|
|
append_if [expr $use_gui] config "
|
|
<binary name=\"$virtualbox_binary\"/>"
|
|
append_if [expr $use_gui] config {
|
|
<resource name="RAM" quantum="448M"/>
|
|
<config vbox_file="test.vbox" vm_name="TestVM">
|
|
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
|
<vfs>
|
|
<dir name="dev"> <log/> <rtc/> </dir>
|
|
<rom name="test.vbox" />
|
|
<rom name="test.iso" />
|
|
</vfs>
|
|
</config>
|
|
<route>
|
|
<service name="Nic"> <child name="nic_bridge"/> </service>
|
|
<service name="Report" label="shape"> <child name="pointer" label="nit_fb2 -> shape"/> </service>
|
|
<service name="Report"> <child name="report_rom"/> </service>
|
|
<service name="Framebuffer"> <child name="nit_fb2" /> </service>
|
|
<service name="Input"> <child name="nit_fb2" /> </service>
|
|
<any-service> <parent /> <any-child /> </any-service>
|
|
</route>
|
|
</start>}
|
|
|
|
append config {
|
|
<start name="vbox1" priority="-2" caps="500">}
|
|
append config "
|
|
<binary name=\"$virtualbox_binary\"/>"
|
|
append config {
|
|
<resource name="RAM" quantum="448M"/>
|
|
<config vbox_file="test.vbox" vm_name="TestVM">
|
|
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
|
|
<vfs>
|
|
<dir name="dev"> <log/> <rtc/> </dir>}
|
|
|
|
append_if [expr $use_serial] config {
|
|
<dir name="dev"> <terminal/> </dir>}
|
|
|
|
append config {
|
|
<rom name="test.vbox" />
|
|
<rom name="test.iso" />
|
|
</vfs>
|
|
</config>
|
|
<route>}
|
|
|
|
append_if [expr $use_bridge] config {
|
|
<service name="Nic"> <child name="nic_bridge"/> </service>}
|
|
|
|
append_if [expr $use_gui] config {
|
|
<service name="Report" label="shape"> <child name="pointer" label="nit_fb1 -> shape"/> </service>
|
|
<service name="Report"> <child name="report_rom"/> </service>
|
|
<service name="Framebuffer"> <child name="nit_fb1" /> </service>
|
|
<service name="Input"> <child name="nit_fb1" /> </service>}
|
|
|
|
append config {
|
|
<any-service> <parent /> <any-child /> </any-service>
|
|
</route>
|
|
</start>
|
|
</config>
|
|
}
|
|
|
|
install_config $config
|
|
|
|
exec cp ${genode_dir}/repos/ports/run/test.vbox bin/.
|
|
|
|
set boot_modules { core ld.lib.so init timer test.iso test.vbox }
|
|
|
|
append boot_modules $virtualbox_binary
|
|
|
|
# platform-specific modules
|
|
lappend_if [expr $use_usb] boot_modules usb_drv
|
|
lappend_if [expr $use_ps2] boot_modules ps2_drv
|
|
lappend_if [have_spec framebuffer] boot_modules fb_drv
|
|
lappend_if [have_spec linux] boot_modules fb_sdl
|
|
lappend_if [have_spec x86] boot_modules rtc_drv
|
|
|
|
lappend_if [expr $use_gui] boot_modules report_rom
|
|
lappend_if [expr $use_gui] boot_modules nitpicker
|
|
lappend_if [expr $use_gui] boot_modules nit_fb
|
|
lappend_if [expr $use_gui] boot_modules pointer
|
|
|
|
append boot_modules {
|
|
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so
|
|
libc_terminal.lib.so libiconv.lib.so stdcxx.lib.so
|
|
qemu-usb.lib.so
|
|
}
|
|
|
|
append_if [expr $use_net] boot_modules { nic_drv }
|
|
append_if [expr $use_bridge] boot_modules { nic_bridge }
|
|
append_if [expr $use_serial] boot_modules { log_terminal }
|
|
|
|
append_platform_drv_boot_modules
|
|
|
|
build_boot_image $boot_modules
|
|
|
|
if {[have_include "power_on/qemu"]} {
|
|
if {[expr $use_gui]} {
|
|
append qemu_args " -m 2048 "
|
|
} else {
|
|
append qemu_args " -m 768 "
|
|
}
|
|
|
|
append qemu_args " -cpu phenom "
|
|
if {[expr $use_usb]} {
|
|
append qemu_args " -usbdevice mouse -usbdevice keyboard"
|
|
}
|
|
}
|
|
|
|
run_genode_until forever
|