mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-19 13:47:56 +00:00
Adapt run scripts to nitpicker config changes
This commit is contained in:
parent
6f627ee073
commit
d3eac95ac5
@ -61,6 +61,8 @@ append config {
|
|||||||
<provides><service name="Nitpicker"/></provides>
|
<provides><service name="Nitpicker"/></provides>
|
||||||
<config>
|
<config>
|
||||||
<report pointer="yes" />
|
<report pointer="yes" />
|
||||||
|
<domain name="" layer="2" />
|
||||||
|
<policy label="" domain=""/>
|
||||||
<global-key name="KEY_SCROLLLOCK" operation="xray" />
|
<global-key name="KEY_SCROLLLOCK" operation="xray" />
|
||||||
<global-key name="KEY_SYSRQ" operation="kill" />
|
<global-key name="KEY_SYSRQ" operation="kill" />
|
||||||
<global-key name="KEY_PRINT" operation="kill" />
|
<global-key name="KEY_PRINT" operation="kill" />
|
||||||
|
@ -120,12 +120,9 @@ append config {
|
|||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
<provides><service name="Nitpicker"/></provides>
|
<provides><service name="Nitpicker"/></provides>
|
||||||
<config>
|
<config>
|
||||||
|
<domain name="" layer="2" />
|
||||||
|
<policy label="" domain=""/>
|
||||||
<report pointer="yes" />
|
<report pointer="yes" />
|
||||||
<global-key name="KEY_SCROLLLOCK" operation="xray" />
|
|
||||||
<global-key name="KEY_SYSRQ" operation="kill" />
|
|
||||||
<global-key name="KEY_PRINT" operation="kill" />
|
|
||||||
<global-key name="KEY_F11" operation="kill" />
|
|
||||||
<global-key name="KEY_F12" operation="xray" />
|
|
||||||
</config>
|
</config>
|
||||||
</start>
|
</start>
|
||||||
<start name="report_rom">
|
<start name="report_rom">
|
||||||
|
@ -16,6 +16,7 @@ build {
|
|||||||
server/terminal_log
|
server/terminal_log
|
||||||
test/nitpicker
|
test/nitpicker
|
||||||
app/launchpad
|
app/launchpad
|
||||||
|
app/pointer
|
||||||
}
|
}
|
||||||
create_boot_directory
|
create_boot_directory
|
||||||
|
|
||||||
@ -58,6 +59,12 @@ append_if [have_spec sdl] config {
|
|||||||
<start name="nitpicker">
|
<start name="nitpicker">
|
||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
<provides><service name="Nitpicker"/></provides>
|
<provides><service name="Nitpicker"/></provides>
|
||||||
|
<config>
|
||||||
|
<domain name="pointer" layer="1" xray="no" origin="pointer" />
|
||||||
|
<domain name="" layer="2" />
|
||||||
|
<policy label="pointer" domain="pointer"/>
|
||||||
|
<policy label="" domain=""/>
|
||||||
|
</config>
|
||||||
<route>
|
<route>
|
||||||
<service name="Input"> <child name="fb_sdl"/> </service>
|
<service name="Input"> <child name="fb_sdl"/> </service>
|
||||||
<service name="Framebuffer"> <child name="fb_sdl"/> </service>
|
<service name="Framebuffer"> <child name="fb_sdl"/> </service>
|
||||||
@ -88,6 +95,12 @@ append_if [expr ! [have_spec sdl]] config {
|
|||||||
<start name="nitpicker">
|
<start name="nitpicker">
|
||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
<provides><service name="Nitpicker"/></provides>
|
<provides><service name="Nitpicker"/></provides>
|
||||||
|
<config>
|
||||||
|
<domain name="pointer" layer="1" xray="no" origin="pointer" />
|
||||||
|
<domain name="" layer="2" />
|
||||||
|
<policy label="pointer" domain="pointer"/>
|
||||||
|
<policy label="" domain=""/>
|
||||||
|
</config>
|
||||||
<route>
|
<route>
|
||||||
<service name="Input"> <child name="input_drv"/> </service>
|
<service name="Input"> <child name="input_drv"/> </service>
|
||||||
<service name="Framebuffer"> <child name="fb_drv"/> </service>
|
<service name="Framebuffer"> <child name="fb_drv"/> </service>
|
||||||
@ -96,6 +109,9 @@ append_if [expr ! [have_spec sdl]] config {
|
|||||||
</start>}
|
</start>}
|
||||||
|
|
||||||
append config {
|
append config {
|
||||||
|
<start name="pointer">
|
||||||
|
<resource name="RAM" quantum="1M"/>
|
||||||
|
</start>
|
||||||
<start name="terminal_fb">
|
<start name="terminal_fb">
|
||||||
<binary name="nit_fb"/>
|
<binary name="nit_fb"/>
|
||||||
<resource name="RAM" quantum="4M"/>
|
<resource name="RAM" quantum="4M"/>
|
||||||
@ -137,6 +153,7 @@ set boot_modules {
|
|||||||
core init
|
core init
|
||||||
timer
|
timer
|
||||||
nitpicker
|
nitpicker
|
||||||
|
pointer
|
||||||
launchpad
|
launchpad
|
||||||
testnit
|
testnit
|
||||||
nit_fb
|
nit_fb
|
||||||
|
@ -2,7 +2,7 @@ build {
|
|||||||
core init
|
core init
|
||||||
drivers/timer
|
drivers/timer
|
||||||
server/nitpicker server/nit_fb
|
server/nitpicker server/nit_fb
|
||||||
app/launchpad
|
app/launchpad app/pointer
|
||||||
app/eglgears
|
app/eglgears
|
||||||
drivers/framebuffer drivers/pci drivers/input
|
drivers/framebuffer drivers/pci drivers/input
|
||||||
lib/gallium
|
lib/gallium
|
||||||
@ -65,8 +65,17 @@ append config {
|
|||||||
<start name="nitpicker">
|
<start name="nitpicker">
|
||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
<provides><service name="Nitpicker"/></provides>
|
<provides><service name="Nitpicker"/></provides>
|
||||||
|
<config>
|
||||||
|
<domain name="pointer" layer="1" xray="no" origin="pointer" />
|
||||||
|
<domain name="" layer="2" />
|
||||||
|
<policy label="pointer" domain="pointer"/>
|
||||||
|
<policy label="" domain=""/>
|
||||||
|
</config>
|
||||||
<route><any-service><parent/><any-child/></any-service></route>
|
<route><any-service><parent/><any-child/></any-service></route>
|
||||||
</start>
|
</start>
|
||||||
|
<start name="pointer">
|
||||||
|
<resource name="RAM" quantum="1M"/>
|
||||||
|
</start>
|
||||||
<start name="launchpad">
|
<start name="launchpad">
|
||||||
<resource name="RAM" quantum="1G"/>
|
<resource name="RAM" quantum="1G"/>
|
||||||
<config>
|
<config>
|
||||||
@ -114,7 +123,7 @@ install_config $config
|
|||||||
|
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init ld.lib.so timer nitpicker nit_fb
|
core init ld.lib.so timer nitpicker nit_fb
|
||||||
launchpad eglgears
|
launchpad eglgears pointer
|
||||||
gallium.lib.so libc.lib.so libm.lib.so pthread.lib.so
|
gallium.lib.so libc.lib.so libm.lib.so pthread.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -72,6 +72,9 @@ append config {
|
|||||||
<start name="nitpicker">
|
<start name="nitpicker">
|
||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
<provides><service name="Nitpicker"/></provides>
|
<provides><service name="Nitpicker"/></provides>
|
||||||
|
<config>
|
||||||
|
<domain name="" layer="2" /> <policy label="" domain=""/>
|
||||||
|
</config>
|
||||||
</start>
|
</start>
|
||||||
<start name="loader">
|
<start name="loader">
|
||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
|
@ -21,7 +21,7 @@ build {
|
|||||||
drivers/timer drivers/uart
|
drivers/timer drivers/uart
|
||||||
app/gdb_monitor
|
app/gdb_monitor
|
||||||
test/gdb_monitor
|
test/gdb_monitor
|
||||||
server/nitpicker app/scout
|
server/nitpicker app/pointer app/scout
|
||||||
drivers/framebuffer drivers/pci drivers/input
|
drivers/framebuffer drivers/pci drivers/input
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -64,13 +64,23 @@ set config {
|
|||||||
<resource name="RAM" quantum="10M"/>
|
<resource name="RAM" quantum="10M"/>
|
||||||
<provides><service name="Nitpicker"/></provides>
|
<provides><service name="Nitpicker"/></provides>
|
||||||
<config>
|
<config>
|
||||||
<target name="nitpicker"/>
|
<target name="nitpicker">
|
||||||
|
<config>
|
||||||
|
<domain name="pointer" layer="1" xray="no" origin="pointer" />
|
||||||
|
<domain name="" layer="3" />
|
||||||
|
<policy label="pointer" domain="pointer"/>
|
||||||
|
<policy label="" domain=""/>
|
||||||
|
</config>
|
||||||
|
</target>
|
||||||
<preserve name="RAM" quantum="2M"/>
|
<preserve name="RAM" quantum="2M"/>
|
||||||
<libc stdout="/dev/log" stderr="/dev/log">
|
<libc stdout="/dev/log" stderr="/dev/log">
|
||||||
<vfs> <dir name="dev"> <log/> </dir> </vfs>
|
<vfs> <dir name="dev"> <log/> </dir> </vfs>
|
||||||
</libc>
|
</libc>
|
||||||
</config>
|
</config>
|
||||||
</start>
|
</start>
|
||||||
|
<start name="pointer">
|
||||||
|
<resource name="RAM" quantum="1M"/>
|
||||||
|
</start>
|
||||||
<start name="scout">
|
<start name="scout">
|
||||||
<resource name="RAM" quantum="32M"/>
|
<resource name="RAM" quantum="32M"/>
|
||||||
</start>}
|
</start>}
|
||||||
@ -109,7 +119,7 @@ set boot_modules {
|
|||||||
ld.lib.so libc.lib.so libc_lock_pipe.lib.so libc_terminal.lib.so
|
ld.lib.so libc.lib.so libc_lock_pipe.lib.so libc_terminal.lib.so
|
||||||
uart_drv
|
uart_drv
|
||||||
gdb_monitor
|
gdb_monitor
|
||||||
nitpicker scout
|
nitpicker pointer scout
|
||||||
}
|
}
|
||||||
|
|
||||||
# platform-specific modules
|
# platform-specific modules
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
set build_components {
|
set build_components {
|
||||||
core init drivers/timer noux lib/libc_noux
|
core init drivers/timer noux lib/libc_noux
|
||||||
drivers/framebuffer drivers/pci drivers/input
|
drivers/framebuffer drivers/pci drivers/input
|
||||||
server/terminal server/ram_fs server/nitpicker
|
server/terminal server/ram_fs server/nitpicker app/pointer
|
||||||
server/nit_fb
|
server/nit_fb
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -90,6 +90,12 @@ append config {
|
|||||||
<start name="nitpicker">
|
<start name="nitpicker">
|
||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
<provides><service name="Nitpicker"/></provides>
|
<provides><service name="Nitpicker"/></provides>
|
||||||
|
<config>
|
||||||
|
<domain name="pointer" layer="1" xray="no" origin="pointer" />
|
||||||
|
<domain name="" layer="2" />
|
||||||
|
<policy label="pointer" domain="pointer"/>
|
||||||
|
<policy label="" domain=""/>
|
||||||
|
</config>
|
||||||
<route> }
|
<route> }
|
||||||
append_if [have_spec ps2] config {
|
append_if [have_spec ps2] config {
|
||||||
<service name="Input"><child name="ps2_drv"/></service> }
|
<service name="Input"><child name="ps2_drv"/></service> }
|
||||||
@ -98,6 +104,9 @@ append config {
|
|||||||
<any-service><parent/><any-child/></any-service>
|
<any-service><parent/><any-child/></any-service>
|
||||||
</route>
|
</route>
|
||||||
</start>
|
</start>
|
||||||
|
<start name="pointer">
|
||||||
|
<resource name="RAM" quantum="1M"/>
|
||||||
|
</start>
|
||||||
<start name="terminal_noux_fb">
|
<start name="terminal_noux_fb">
|
||||||
<binary name="nit_fb"/>
|
<binary name="nit_fb"/>
|
||||||
<resource name="RAM" quantum="2M"/>
|
<resource name="RAM" quantum="2M"/>
|
||||||
@ -186,7 +195,7 @@ install_config $config
|
|||||||
|
|
||||||
# generic modules
|
# generic modules
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init timer ld.lib.so noux terminal ram_fs nitpicker nit_fb
|
core init timer ld.lib.so noux terminal ram_fs nitpicker nit_fb pointer
|
||||||
libc.lib.so libm.lib.so libc_noux.lib.so
|
libc.lib.so libm.lib.so libc_noux.lib.so
|
||||||
bash.tar coreutils.tar
|
bash.tar coreutils.tar
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user