mirror of
https://github.com/genodelabs/genode.git
synced 2025-03-03 05:09:39 +00:00
Modularize Sculpt OS image creation
This patch equips Sculpt with the ability to customize the system image in very flexible ways. All customizable aspects of the image have been relocated from the former sculpt.run script and the accompanied gems/run/sculpt/ directory to a new location - the sculpt/ directory - which can exist in any repository. The directory at repos/gems/sculpt/ serves as reference. The sculpt directory can host any number of <name>-<board>.sculpt files, each containing a list of ingredients to be incorporated into the Sculpt system image. The <name> can be specified to the sculpt.run script. E.g., the following command refers to the 'default-pc.sculpt' file: make run/sculpt KERNEL=nova BOARD=pc SCULPT=default If no 'SCULPT' argument is supplied, the value 'default' is used. A .sculpt file refers to a selection of files found at various subdirectries named after their respective purpose. In particular, There exists a subdirectory for each file in Sculpt's config fs, like nitpicker, drivers... The .sculpt file selects the alternative to use by a simple tag-value notation. drivers: pc The supported tags are as follows. *Optional* selection of /config files. If not specified, those files are omitted, which prompts Sculpt to manage those configurations automatically or via the Leitzentrale GUI: fonts nic_router event_filter wifi runtime gpu_drv Selection of mandatory /config files. If not specified, the respective 'default' alternative will be used. nitpicker deploy fb_drv clipboard drivers numlock_remap leitzentrale usb system ram_fs Furthermore, the .sculpt file supports the optional selection of supplemental content such as a set of launchers. launches: nano3d system_shell Another type of content are the set of blessed pubkey/download files used for installing and verifying software on target. With the new version, it has become possible to supply a depot with the the system image. The depot content is assembled according to the 'pkg' attributes found in launcher files and the selected deploy config. The resulting depot is incorporated into the system image as 'depot.tar' archive. It can be supplied to the Sculpt system by mounting it into the ram fs as done by the 'ram_fs/depot' configuration for the ram fs. It is possible to add additional boot modules to the system image. There are two options. build: <list of targets> This tag prompts the sculpt.run script to build the specified targets directly using the Genode build system and add the created artifacts into the system image as boot modules. import: <list of depot src or pkg archives> This tag instructs Sculpt to supply the specifid depot-archive content as boot modules to the system image. This change eliminates the need for board-specific pkg/sculpt-<board> archives. The board-specific specializations can now be placed directly into the respective .sculpt files by using 'import:'. To make the use of Sculpt as testbed during development more convenient, the log output of the drivers, leitzentrale, and runtime subsystems can be redirected to core using the optional 'LOG=core' argument, e.g., make run/sculpt KERNEL=linux BOARD=linux LOG=core The former pkg/sculpt-installation and pkg/sculpt-installation-pc archives have been replaced by pkg/sculpt_distribution-pc, which references the generic pkg/sculpt_distribution archive. Those pkgs are solely used for publishing / distribution purposes. Fixes #4369
This commit is contained in:
Norman Feske
Christian Helmuth
parent
fcc96a2c46
commit
b723b11b30
@ -6,8 +6,10 @@ _/src/usb_hid_drv
|
||||
_/src/usb_block_drv
|
||||
_/src/vesa_drv
|
||||
_/src/intel_fb_drv
|
||||
_/src/intel_gpu_drv
|
||||
_/src/boot_fb_drv
|
||||
_/src/ahci_drv
|
||||
_/src/nvme_drv
|
||||
_/src/report_rom
|
||||
_/src/event_filter
|
||||
_/src/init
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Default installation for a sculpt-based desktop
|
||||
@ -1 +0,0 @@
|
||||
Minimal version of Sculpt executable on Linux
|
||||
@ -1,2 +0,0 @@
|
||||
_/pkg/drivers_interactive-linux
|
||||
_/pkg/sculpt
|
||||
@ -1 +0,0 @@
|
||||
2022-01-03-a c6a760c01679c9213f0ae83b4075a5c73c3f09a9
|
||||
@ -1 +0,0 @@
|
||||
The x86-PC specific parts needed to run sculpt.
|
||||
@ -1,7 +0,0 @@
|
||||
_/pkg/drivers_managed-pc
|
||||
_/pkg/sculpt
|
||||
_/pkg/wifi
|
||||
_/src/ipxe_nic_drv
|
||||
_/src/nvme_drv
|
||||
_/src/intel_gpu_drv
|
||||
|
||||
@ -1 +0,0 @@
|
||||
2021-12-16 f45375a47663d677e8f13447a1dc38e61ebc1450
|
||||
1
repos/gems/recipes/pkg/sculpt_distribution-pc/README
Normal file
1
repos/gems/recipes/pkg/sculpt_distribution-pc/README
Normal file
@ -0,0 +1 @@
|
||||
Default Sculpt distribution for PC platforms
|
||||
12
repos/gems/recipes/pkg/sculpt_distribution-pc/archives
Normal file
12
repos/gems/recipes/pkg/sculpt_distribution-pc/archives
Normal file
@ -0,0 +1,12 @@
|
||||
_/pkg/sculpt
|
||||
_/pkg/drivers_managed-pc
|
||||
_/pkg/wifi
|
||||
_/pkg/ipxe_nic_drv
|
||||
_/pkg/vbox6
|
||||
_/pkg/vbox6-capture
|
||||
_/pkg/vbox5-nova-sculpt
|
||||
_/pkg/acpica
|
||||
_/pkg/system_clock-pc
|
||||
_/pkg/mesa_gpu-intel
|
||||
_/pkg/file_vault
|
||||
_/pkg/bsd_audio_drv
|
||||
1
repos/gems/recipes/pkg/sculpt_distribution/README
Normal file
1
repos/gems/recipes/pkg/sculpt_distribution/README
Normal file
@ -0,0 +1 @@
|
||||
Hardware-agnostic parts of the default Sculpt OS distribution
|
||||
@ -1,6 +1,4 @@
|
||||
_/pkg/system_shell
|
||||
_/pkg/wifi
|
||||
_/pkg/ipxe_nic_drv
|
||||
_/pkg/chroot
|
||||
_/pkg/recall_fs
|
||||
_/pkg/black_hole
|
||||
@ -8,9 +6,6 @@ _/pkg/nit_focus
|
||||
_/pkg/rom_filter
|
||||
_/pkg/rom_reporter
|
||||
_/pkg/nic_router-nat
|
||||
_/pkg/vbox6
|
||||
_/pkg/vbox6-capture
|
||||
_/pkg/vbox5-nova-sculpt
|
||||
_/pkg/wm
|
||||
_/pkg/themed_wm
|
||||
_/pkg/themed_decorator
|
||||
@ -21,13 +16,8 @@ _/pkg/nano3d
|
||||
_/pkg/mesa_gears
|
||||
_/pkg/fonts_fs
|
||||
_/pkg/report_dump
|
||||
_/pkg/acpica
|
||||
_/pkg/qt5_textedit
|
||||
_/pkg/system_clock-pc
|
||||
_/pkg/mesa_gpu-cpu
|
||||
_/pkg/mesa_gpu-intel
|
||||
_/pkg/usb_webcam
|
||||
_/pkg/file_vault
|
||||
_/pkg/test-capture
|
||||
_/pkg/bsd_audio_drv
|
||||
_/pkg/mixer
|
||||
1
repos/gems/recipes/pkg/sculpt_distribution/hash
Normal file
1
repos/gems/recipes/pkg/sculpt_distribution/hash
Normal file
@ -0,0 +1 @@
|
||||
2021-12-16 3d12db23d24f0c953ac013ec9adb9ec60ce3da13
|
||||
@ -1,14 +1,20 @@
|
||||
content: drivers.config fb_drv.config event_filter.config en_us.chargen \
|
||||
special.chargen numlock_remap.config gpu_drv.config
|
||||
|
||||
drivers.config numlock_remap.config event_filter.config:
|
||||
cp $(REP_DIR)/recipes/raw/drivers_managed-pc/$@ $@
|
||||
drivers.config:
|
||||
cp $(REP_DIR)/sculpt/drivers/pc $@
|
||||
|
||||
numlock_remap.config:
|
||||
cp $(REP_DIR)/sculpt/numlock_remap/default $@
|
||||
|
||||
event_filter.config:
|
||||
cp $(REP_DIR)/sculpt/event_filter/pc $@
|
||||
|
||||
fb_drv.config:
|
||||
cp $(GENODE_DIR)/repos/os/recipes/raw/drivers_interactive-pc/$@ $@
|
||||
cp $(REP_DIR)/sculpt/fb_drv/default $@
|
||||
|
||||
gpu_drv.config:
|
||||
cp $(GENODE_DIR)/repos/os/src/drivers/gpu/intel/$@ $@
|
||||
cp $(REP_DIR)/sculpt/gpu_drv/intel $@
|
||||
|
||||
en_us.chargen special.chargen:
|
||||
cp $(GENODE_DIR)/repos/os/src/server/event_filter/$@ $@
|
||||
|
||||
@ -1,9 +1,22 @@
|
||||
#
|
||||
# \brief Sculpt OS
|
||||
# \author Norman Feske
|
||||
# \date 2017-09-07
|
||||
#
|
||||
|
||||
#
|
||||
# Note: the string must be exactly 5 bytes long.
|
||||
#
|
||||
proc sculpt_version { } { return "21.11" }
|
||||
|
||||
|
||||
proc assert_platform_supported { } {
|
||||
|
||||
if {[have_board pc]} return
|
||||
if {[have_board imx8q_evk]} return
|
||||
if {[have_board mnt_reform2]} return
|
||||
if {[have_board linux]} return
|
||||
if {[have_board pinephone]} return
|
||||
|
||||
puts "Platform is unsupported.";
|
||||
exit 0;
|
||||
@ -11,14 +24,130 @@ proc assert_platform_supported { } {
|
||||
|
||||
assert_platform_supported
|
||||
|
||||
|
||||
if {[have_spec nova]} {
|
||||
proc kernel_output { } { return "novga serial logmem" }
|
||||
}
|
||||
|
||||
|
||||
##
|
||||
## Utilities for querying the ingredients of Sculpt
|
||||
##
|
||||
|
||||
##
|
||||
# Return path to the sculpt definition file that contains the list of
|
||||
# ingredients
|
||||
#
|
||||
proc sculpt_path { } {
|
||||
|
||||
global ::env
|
||||
|
||||
set filename "default-[board].sculpt"
|
||||
if {[info exists ::env(SCULPT)]} {
|
||||
set filename "$::env(SCULPT)-[board].sculpt" }
|
||||
|
||||
return [select_from_repositories [file join sculpt $filename]]
|
||||
}
|
||||
|
||||
|
||||
##
|
||||
# Return list of ingredients of scenario supplied via the 'SCULPT' argument
|
||||
#
|
||||
# If 'SCULPT' is not specified, use 'sculpt/default.sculpt'.
|
||||
#
|
||||
proc sculpt_ingredients { } {
|
||||
|
||||
global _sculpt_ingredients
|
||||
|
||||
if {![info exists _sculpt_ingredients]} {
|
||||
set fh [open [sculpt_path] "RDONLY"]
|
||||
set _sculpt_ingredients [split [read $fh] "\n"]
|
||||
close $fh
|
||||
}
|
||||
|
||||
return $_sculpt_ingredients
|
||||
}
|
||||
|
||||
|
||||
proc ingredients_of_type { type } {
|
||||
|
||||
set result {}
|
||||
set line 1
|
||||
foreach i [sculpt_ingredients] {
|
||||
|
||||
# skip comment lines
|
||||
if {[string match "#*" $i]} {
|
||||
continue }
|
||||
|
||||
# skip empty lines
|
||||
if {[string match "" $i]} {
|
||||
continue }
|
||||
|
||||
regexp {^(.*?):\s*(.*)\s*$} $i dummy tag values
|
||||
|
||||
if {$tag == $type} {
|
||||
lappend result {*}$values}
|
||||
|
||||
incr line
|
||||
}
|
||||
return $result
|
||||
}
|
||||
|
||||
|
||||
proc single_ingredient { type default } {
|
||||
|
||||
set ingredient [ingredients_of_type $type]
|
||||
|
||||
if {[llength $ingredient] == 0} {
|
||||
return $default }
|
||||
|
||||
if {[llength $ingredient] > 1} {
|
||||
puts stderr "Error: ambigious selection of '$type' in [sculpt_path]"
|
||||
exit
|
||||
}
|
||||
return $ingredient
|
||||
}
|
||||
|
||||
|
||||
proc ingredient_path { type ingredient } {
|
||||
return [select_from_repositories [file join sculpt $type $ingredient]] }
|
||||
|
||||
proc initial_config_dir { } {
|
||||
return [file join [run_dir] initial_config] }
|
||||
|
||||
proc initial_config_file { rel_path } {
|
||||
return [file join [initial_config_dir] $rel_path] }
|
||||
|
||||
|
||||
##
|
||||
## System-image content imported from depot archives
|
||||
##
|
||||
|
||||
create_boot_directory
|
||||
|
||||
|
||||
proc prefixed_with_depot_user { paths } {
|
||||
return [lmap path $paths { file join [depot_user] $path }] }
|
||||
|
||||
|
||||
import_from_depot [depot_user]/src/[base_src] \
|
||||
[depot_user]/pkg/sculpt-[board]
|
||||
[depot_user]/pkg/sculpt \
|
||||
{*}[prefixed_with_depot_user [ingredients_of_type import]]
|
||||
|
||||
|
||||
##
|
||||
## Static init configuration
|
||||
##
|
||||
|
||||
proc log_route { } {
|
||||
|
||||
global ::env
|
||||
if {[info exists ::env(LOG)]} {
|
||||
if {$::env(LOG) == "core"} {
|
||||
return {<service name="LOG"> <parent/> </service>} } }
|
||||
|
||||
return {<service name="LOG"> <child name="log"/> </service>}
|
||||
}
|
||||
|
||||
|
||||
proc nic_drv { } {
|
||||
@ -26,10 +155,8 @@ proc nic_drv { } {
|
||||
if {[have_board pc]} { return ipxe_nic_drv }
|
||||
if {[have_board imx8q_evk]} { return fec_nic_drv }
|
||||
if {[have_board mnt_reform2]} { return fec_nic_drv }
|
||||
if {[have_board linux]} { return nic_unavailable }
|
||||
|
||||
puts "\n Run script is not supported on this platform. \n";
|
||||
exit 0;
|
||||
return nic_unavailable
|
||||
}
|
||||
|
||||
|
||||
@ -70,43 +197,6 @@ proc log_kernel_start_node { } {
|
||||
}
|
||||
|
||||
|
||||
proc config_fs_gpu_drv { } {
|
||||
|
||||
if {[have_board linux]} return
|
||||
|
||||
return {<rom name="gpu_drv" label="gpu_drv.config"/>}
|
||||
}
|
||||
|
||||
|
||||
proc config_fs_system { } {
|
||||
|
||||
return {<inline name="system"><system state=""/>
|
||||
<!-- supported states: "poweroff" or "reset" when acpica started -->
|
||||
<!-- Note: power down your persistent Genode applications & VMs beforehand on your own ! -->
|
||||
</inline>}
|
||||
}
|
||||
|
||||
|
||||
proc config_fs_numlock_remap { } {
|
||||
|
||||
# the drivers_interactive pkg does not host a numlock_remap_rom component
|
||||
if {[have_board linux]} return
|
||||
|
||||
return {<rom name="numlock_remap" label="numlock_remap.config"/>}
|
||||
}
|
||||
|
||||
|
||||
proc config_fs_event_filter { } {
|
||||
|
||||
#
|
||||
# Prevent the sculpt manager from generating the event-filter configuration.
|
||||
# Use the configuration provided by drivers_interactive pkg instead.
|
||||
#
|
||||
if {[have_board linux]} {
|
||||
return {<rom name="event_filter" label="event_filter.config"/>} }
|
||||
}
|
||||
|
||||
|
||||
install_config {
|
||||
<config prio_levels="2">
|
||||
<parent-provides>
|
||||
@ -178,37 +268,7 @@ install_config {
|
||||
<config>
|
||||
<vfs>
|
||||
<ram/>
|
||||
<import>
|
||||
<dir name="managed">
|
||||
<rom name="fonts" label="fonts.config"/>
|
||||
<rom name="fb_drv" label="fb_drv.config"/>
|
||||
<rom name="wifi" label="wifi.config"/>
|
||||
<rom name="installation"/>
|
||||
<rom name="runtime" label="empty_runtime.config"/>
|
||||
<rom name="event_filter" label="event_filter.config"/>
|
||||
<inline name="depot_query"><query/></inline>
|
||||
</dir>
|
||||
<dir name="keyboard">
|
||||
<rom name="en_us" label="en_us.chargen"/>
|
||||
<rom name="de_ch" label="de_ch.chargen"/>
|
||||
<rom name="de_de" label="de_de.chargen"/>
|
||||
<rom name="fr_ch" label="fr_ch.chargen"/>
|
||||
<rom name="fr_fr" label="fr_fr.chargen"/>
|
||||
<rom name="special" label="special.chargen"/>
|
||||
</dir>
|
||||
<rom name="fb_drv" label="fb_drv.config"/>
|
||||
<rom name="nitpicker" label="nitpicker.config"/>
|
||||
<rom name="leitzentrale" label="leitzentrale.config"/>
|
||||
<rom name="drivers" label="drivers.config"/>
|
||||
<rom name="deploy" label="manual_deploy.config"/>
|
||||
<rom name="usb" label="usb.config"/>
|
||||
<rom name="clipboard" label="clipboard.config"/>
|
||||
<rom name="vimrc"/>
|
||||
<tar name="launcher.tar"/>
|
||||
} [config_fs_gpu_drv] {
|
||||
} [config_fs_system] {
|
||||
} [config_fs_numlock_remap] {
|
||||
</import>
|
||||
<import> <tar name="initial_config.tar"/> </import>
|
||||
</vfs>
|
||||
<policy label="config_fs_rom -> " root="/" />
|
||||
<policy label="rw" root="/" writeable="yes" />
|
||||
@ -307,7 +367,7 @@ install_config {
|
||||
<resource name="CPU" quantum="40"/>
|
||||
<binary name="init"/>
|
||||
<route>
|
||||
<service name="LOG"> <child name="log"/> </service>
|
||||
} [log_route] {
|
||||
<service name="ROM" label="config">
|
||||
<child name="config_fs_rom" label="drivers"/> </service>
|
||||
<service name="ROM" label_last="capslock">
|
||||
@ -421,26 +481,12 @@ install_config {
|
||||
|
||||
<start name="global_keys_handler" priority="-1">
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
<config>
|
||||
<bool name="leitzentrale" initial="yes"/>
|
||||
<bool name="capslock" initial="no"/>
|
||||
<bool name="numlock" initial="no"/>
|
||||
<bool name="slides" initial="no"/>
|
||||
|
||||
<press name="KEY_PRESENTATION" bool="slides" change="toggle"/>
|
||||
<press name="KEY_DASHBOARD" bool="leitzentrale" change="toggle"/>
|
||||
<press name="KEY_CAPSLOCK" bool="capslock" change="toggle"/>
|
||||
<press name="KEY_NUMLOCK" bool="numlock" change="toggle"/>
|
||||
|
||||
<report name="leitzentrale"> <bool name="leitzentrale"/> </report>
|
||||
<report name="capslock"> <bool name="capslock"/> </report>
|
||||
<report name="numlock"> <bool name="numlock"/> </report>
|
||||
<report name="slides"> <bool name="slides"/> </report>
|
||||
</config>
|
||||
<route>
|
||||
<service name="Report"> <child name="report_rom"/> </service>
|
||||
<service name="Gui"> <child name="nitpicker"/> </service>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<service name="Report"> <child name="report_rom"/> </service>
|
||||
<service name="Gui"> <child name="nitpicker"/> </service>
|
||||
<service name="Timer"> <child name="timer"/> </service>
|
||||
<service name="ROM" label="config">
|
||||
<child name="config_fs_rom" label="global_keys"/> </service>
|
||||
<any-service> <parent/> </any-service>
|
||||
</route>
|
||||
</start>
|
||||
@ -483,7 +529,7 @@ install_config {
|
||||
<service name="Report"/> <!-- view hover reports -->
|
||||
</provides>
|
||||
<route>
|
||||
<service name="LOG"> <child name="log"/> </service>
|
||||
} [log_route] {
|
||||
<service name="ROM" label="config">
|
||||
<child name="leitzentrale_config"/> </service>
|
||||
<service name="ROM" label_prefix="report -> ">
|
||||
@ -559,7 +605,7 @@ install_config {
|
||||
<child name="leitzentrale" label="fonts"/> </service>
|
||||
<service name="Report"> <child name="fs_report"/> </service>
|
||||
<service name="LOG" label="unlogged"> <parent/> </service>
|
||||
<service name="LOG"> <child name="log"/> </service>
|
||||
} [log_route] {
|
||||
<service name="ROM" label="nic_drv"> <parent label="} [nic_drv] {"/> </service>
|
||||
<service name="Event" label="global"> <child name="nitpicker"/> </service>
|
||||
<service name="Event" label="leitzentrale"> <child name="leitzentrale"/> </service>
|
||||
@ -571,47 +617,247 @@ install_config {
|
||||
|
||||
</config>}
|
||||
|
||||
foreach file [glob "[genode_dir]/repos/gems/run/sculpt/*.config"] {
|
||||
copy_file $file [run_dir]/genode/ }
|
||||
|
||||
##
|
||||
## Initial content of the config file system
|
||||
##
|
||||
|
||||
#
|
||||
# Override files normally obtained from depot archive with the most current
|
||||
# version found in the Genode source tree. This way, we don't need to
|
||||
# rebuild the corresponding depot archives each time we tweak one of the
|
||||
# files. This is just a hack to accelerate the work flow.
|
||||
# The directory structure for the initial content is created at the run
|
||||
# directory, which is imported as 'initial_config.tar' into the config fs.
|
||||
#
|
||||
|
||||
copy_file [genode_dir]/repos/gems/recipes/pkg/sculpt/README [run_dir]/genode/
|
||||
# directory structure
|
||||
foreach subdir { launcher depot managed keyboard } {
|
||||
file mkdir [file join [initial_config_dir] $subdir] }
|
||||
|
||||
copy_file [genode_dir]/repos/gems/run/sculpt/vimrc [run_dir]/genode/
|
||||
|
||||
foreach file { en_us.chargen de_ch.chargen de_de.chargen fr_ch.chargen fr_fr.chargen special.chargen } {
|
||||
copy_file [genode_dir]/repos/os/src/server/event_filter/$file \
|
||||
[run_dir]/genode/$file }
|
||||
|
||||
copy_file [genode_dir]/repos/gems/recipes/raw/depot_download/depot_download.config \
|
||||
[run_dir]/genode/depot_download.config
|
||||
|
||||
copy_file [genode_dir]/VERSION [run_dir]/genode/
|
||||
|
||||
copy_file [genode_dir]/repos/gems/src/app/backdrop/genode_logo.png [run_dir]/genode/
|
||||
copy_file [genode_dir]/repos/gems/run/sculpt/drop_shadow.png [run_dir]/genode/
|
||||
|
||||
if {[have_board pc]} {
|
||||
copy_file [genode_dir]/repos/gems/recipes/raw/drivers_managed-pc/event_filter.config \
|
||||
[run_dir]/genode/event_filter.config
|
||||
|
||||
copy_file [genode_dir]/repos/os/src/drivers/gpu/intel/gpu_drv.config \
|
||||
[run_dir]/genode/gpu_drv.config
|
||||
|
||||
copy_file [genode_dir]/repos/gems/run/sculpt/machine.vbox [run_dir]/genode/
|
||||
|
||||
copy_file [genode_dir]/repos/gems/recipes/raw/drivers_managed-pc/drivers.config \
|
||||
[run_dir]/genode/drivers.config
|
||||
|
||||
exec gzip -dc [genode_dir]/repos/gems/run/sculpt/machine.vdi.gz > [run_dir]/genode/machine.vdi
|
||||
# configs that are managed by the sculpt manager if absent
|
||||
set optional_configs {
|
||||
fonts
|
||||
nic_router
|
||||
event_filter
|
||||
wifi
|
||||
runtime
|
||||
gpu_drv
|
||||
}
|
||||
|
||||
foreach config $optional_configs {
|
||||
set ingredient [single_ingredient $config ""]
|
||||
if {$ingredient != ""} {
|
||||
set from [ingredient_path $config $ingredient]
|
||||
set to [initial_config_file $config]
|
||||
copy_file $from $to } }
|
||||
|
||||
# configs that are expected to be always present
|
||||
set required_configs {
|
||||
nitpicker
|
||||
deploy
|
||||
fb_drv
|
||||
clipboard
|
||||
drivers
|
||||
numlock_remap
|
||||
global_keys
|
||||
leitzentrale
|
||||
usb
|
||||
system
|
||||
ram_fs
|
||||
}
|
||||
|
||||
foreach config $required_configs {
|
||||
set ingredient [single_ingredient $config "default"]
|
||||
set from [ingredient_path $config $ingredient]
|
||||
set to [initial_config_file $config]
|
||||
copy_file $from $to }
|
||||
|
||||
# selection of depot users (pubkey and download files) and launchers
|
||||
foreach type { depot launcher } {
|
||||
foreach ingredient [ingredients_of_type $type] {
|
||||
set from [ingredient_path $type $ingredient]
|
||||
set to [file join [initial_config_dir] $type $ingredient]
|
||||
file copy $from $to } }
|
||||
|
||||
copy_file [genode_dir]/repos/gems/recipes/pkg/sculpt/README [initial_config_file README]
|
||||
copy_file [genode_dir]/repos/gems/run/sculpt/vimrc [initial_config_file vimrc]
|
||||
|
||||
# keyboard layouts
|
||||
foreach file { en_us de_ch de_de fr_ch fr_fr special } {
|
||||
set from [genode_dir]/repos/os/src/server/event_filter/$file.chargen
|
||||
set to [file join [initial_config_dir] keyboard $file]
|
||||
copy_file $from $to }
|
||||
|
||||
|
||||
#
|
||||
# Pre-populate the managed/ directory of the config fs to avoid diagnostic
|
||||
# warnings by components starting up before the sculpt manager has generated
|
||||
# the directory content for the first time.
|
||||
#
|
||||
|
||||
proc managed_config_path { name } {
|
||||
return [file join [initial_config_dir] managed $name] }
|
||||
|
||||
set fd [open [managed_config_path installation] w]
|
||||
puts $fd "<installation arch=\"[depot_spec]\"/>"
|
||||
close $fd
|
||||
|
||||
set fd [open [managed_config_path depot_query] w]
|
||||
puts $fd "<query/>"
|
||||
close $fd
|
||||
|
||||
foreach config { fonts wifi runtime event_filter } {
|
||||
file copy [ingredient_path $config default] [managed_config_path $config] }
|
||||
|
||||
copy_file [file join [initial_config_dir] fb_drv] [managed_config_path fb_drv]
|
||||
|
||||
|
||||
#
|
||||
# VERSION file at the root of the config fs, add newline for 'cat /VERSION'
|
||||
#
|
||||
|
||||
set fd [open [initial_config_file VERSION] w]
|
||||
puts $fd "[sculpt_version]"
|
||||
close $fd
|
||||
|
||||
# supply VERSION as a boot module to the sculpt manager
|
||||
file copy [initial_config_file VERSION] [run_dir]/genode/VERSION
|
||||
|
||||
|
||||
##
|
||||
# Return list of 'pkg' attribute values found in 'type' nodes in an XML file
|
||||
#
|
||||
proc pkg_attribute_values { xml_file node_path } {
|
||||
|
||||
set xpath "$node_path/attribute::pkg"
|
||||
set values {}
|
||||
|
||||
if {[catch {
|
||||
foreach attr [exec xmllint --xpath $xpath $xml_file] {
|
||||
regexp {^pkg="(.*)"$} $attr dummy value
|
||||
lappend values $value
|
||||
}
|
||||
}]} {
|
||||
# no pkg attribute present in 'xml_file'
|
||||
}
|
||||
return $values
|
||||
}
|
||||
|
||||
|
||||
##
|
||||
# Return list of pkg archives reference by the launchers and deploy config
|
||||
#
|
||||
proc referenced_pkg_values { } {
|
||||
|
||||
set values {}
|
||||
|
||||
# scan launchers
|
||||
foreach launcher [ingredients_of_type launcher] {
|
||||
set path [file join [initial_config_dir] launcher $launcher]
|
||||
lappend values {*}[pkg_attribute_values $path launcher]
|
||||
}
|
||||
|
||||
# scan deploy config
|
||||
lappend values {*}[pkg_attribute_values [initial_config_file deploy] config/start]
|
||||
|
||||
return [lsort -unique $values]
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Replace pkg values of the form "name" by the form "user/pkg/name" suitable as
|
||||
# arguments for '_collect_from_depot'.
|
||||
#
|
||||
proc pkg_archive_paths { values } {
|
||||
|
||||
set result {}
|
||||
foreach value $values {
|
||||
if {[regexp {/} $value dummy]} {
|
||||
lappend result $value
|
||||
} else {
|
||||
lappend result "[depot_user]/pkg/$value"
|
||||
}
|
||||
}
|
||||
return $result
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Trigger the creation / updating of referenced depot content
|
||||
#
|
||||
# This step may update pkg versions if '--depot-auto-update' is enabled.
|
||||
#
|
||||
_collect_from_depot [pkg_archive_paths [referenced_pkg_values]]
|
||||
|
||||
|
||||
#
|
||||
# Augment deploy config or launcher file with current package versions
|
||||
#
|
||||
|
||||
proc current_pkg { pkg } { return $pkg/[_current_depot_archive_version pkg $pkg] }
|
||||
|
||||
|
||||
#
|
||||
# Supplement file with versioned pkg archive paths
|
||||
#
|
||||
# \path deploy config or launcher to augment
|
||||
# \node XML node type containing the 'pkg' attribute to modify
|
||||
#
|
||||
# Each matching XML node is inspected regarding its 'pkg' attribute. If its
|
||||
# 'pkg' attribute contains a single identifier (rather than a valid pkg path),
|
||||
# the attribute value is replaced by a valid pkg path referring to the current
|
||||
# version of the pkg and the [depot_user].
|
||||
#
|
||||
proc augment_pkg_versions { path node } {
|
||||
|
||||
set fd [open $path r]
|
||||
set content [read $fd]
|
||||
close $fd
|
||||
|
||||
# filter 'pkg' attribute
|
||||
set pattern "(\<$node\[^\>\]+?pkg=\")(\[^/\]+)(\")"
|
||||
while {[regexp $pattern $content dummy head pkg tail]} {
|
||||
set pkg_path [depot_user]/pkg/[current_pkg $pkg]
|
||||
regsub $pattern $content "$head$pkg_path$tail" content
|
||||
}
|
||||
|
||||
# write back the filtered launcher snippet
|
||||
set fd [open $path w]
|
||||
puts $fd $content
|
||||
close $fd
|
||||
}
|
||||
|
||||
|
||||
# launcher snippets
|
||||
foreach launcher [ingredients_of_type launcher] {
|
||||
augment_pkg_versions [file join [initial_config_dir] launcher $launcher] "launcher" }
|
||||
|
||||
|
||||
# deploy config
|
||||
augment_pkg_versions [initial_config_file deploy] "start"
|
||||
|
||||
|
||||
# update arch attribute of deploy config
|
||||
exec sed -i "/config/s/arch=\"\"/arch=\"[depot_spec]\"/" [initial_config_file deploy]
|
||||
|
||||
|
||||
##
|
||||
## Depot content integrated in the Sculpt image
|
||||
##
|
||||
|
||||
create_tar_from_depot_binaries [run_dir]/genode/depot.tar \
|
||||
{*}[pkg_archive_paths [referenced_pkg_values]]
|
||||
|
||||
|
||||
#
|
||||
# Create initial_config.tar to be mounted at the root of the config fs
|
||||
#
|
||||
|
||||
exec sh -c "tar cf [run_dir]/genode/initial_config.tar -C [initial_config_dir] ."
|
||||
|
||||
file delete -force [initial_config_dir]
|
||||
|
||||
|
||||
##
|
||||
## Auxiliary boot modules
|
||||
##
|
||||
|
||||
#
|
||||
# Linux-specific tweaks
|
||||
@ -627,111 +873,18 @@ if {[have_board linux]} {
|
||||
# Managed dataspaces as used by cached_fs_rom are not supported on Linux.
|
||||
#
|
||||
copy_file [run_dir]/genode/fs_rom [run_dir]/genode/cached_fs_rom
|
||||
|
||||
#
|
||||
# The drivers_interactive-linux pkg does not offer a numlock.remap ROM as
|
||||
# referenced by the event-filter config generated by sculpt manager.
|
||||
#
|
||||
install_boot_module "numlock.remap" {<remap/>}
|
||||
}
|
||||
|
||||
|
||||
#
|
||||
# Define 'VERSION' ROM module
|
||||
#
|
||||
# Note: the string must be exactly 5 bytes long.
|
||||
#
|
||||
proc sculpt_version { } {
|
||||
return "21.11" }
|
||||
|
||||
# write file with newline (for producing nice output when using 'cat /VERSION')
|
||||
install_boot_module VERSION "[sculpt_version]"
|
||||
|
||||
|
||||
#
|
||||
# Depot packages to be included in the default installation
|
||||
#
|
||||
|
||||
proc current_pkg { pkg } { return $pkg/[_current_depot_archive_version pkg $pkg] }
|
||||
|
||||
set pkgs_to_install { }
|
||||
|
||||
set fd [open [run_dir]/genode/installation w]
|
||||
puts $fd "<installation arch=\"[depot_spec]\">"
|
||||
foreach pkg $pkgs_to_install {
|
||||
puts $fd " <archive path=\"[depot_user]/pkg/[current_pkg $pkg]\" source=\"false\"/>" }
|
||||
puts $fd "</installation>"
|
||||
close $fd
|
||||
|
||||
|
||||
#
|
||||
# Configuration of deploy runtime
|
||||
#
|
||||
# This configuration is not provided as a file at run/sculpt/ because some
|
||||
# parts need to be filled in at run-script execution time, in particular the
|
||||
# current versions of the packages to deploy.
|
||||
#
|
||||
install_boot_module "manual_deploy.config" {<config arch="} [depot_spec] {">
|
||||
|
||||
<common_routes>
|
||||
<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
|
||||
<service name="CPU"> <parent/> </service>
|
||||
<service name="PD"> <parent/> </service>
|
||||
<service name="LOG"> <parent/> </service>
|
||||
<service name="Timer"> <parent/> </service>
|
||||
</common_routes>
|
||||
|
||||
</config>}
|
||||
|
||||
|
||||
#
|
||||
# Install launcher snippets
|
||||
#
|
||||
# The launcher snippets are wrapped into a tar archive to be loaded as boot
|
||||
# module. This procedure involves the following steps:
|
||||
#
|
||||
# The launcher snippets are copied from run/sculpt/launcher/ to
|
||||
# [run_dir]/genode/launcher. Each launcher is inspected regarding its 'pkg'
|
||||
# attribute. If its 'pkg' attribute contains a single identifier (rather than
|
||||
# a valid pkg path), the attribute value is replaced by a valid pkg path
|
||||
# referring to the current version of the pkg and the [depot_user]. The
|
||||
# filtered launchers are archived into 'launcher.tar' and removed from the
|
||||
# [run_dir].
|
||||
#
|
||||
|
||||
set launchers [glob -tails -directory [genode_dir]/repos/gems/run/sculpt/launcher/ *]
|
||||
|
||||
foreach file $launchers {
|
||||
|
||||
# skip backup files
|
||||
if {[regexp {~$} $file dummy]} { continue }
|
||||
|
||||
set fd [open [genode_dir]/repos/gems/run/sculpt/launcher/$file r]
|
||||
set content [read $fd]
|
||||
close $fd
|
||||
|
||||
# filter 'pkg' attribute
|
||||
set pattern {(\<launcher[^\>]+?pkg=")([^/]+)(")}
|
||||
if {[regexp $pattern $content dummy head pkg tail]} {
|
||||
set pkg_path [depot_user]/pkg/[current_pkg $pkg]
|
||||
regsub $pattern $content "$head$pkg_path$tail" content
|
||||
}
|
||||
|
||||
# write filtered launcher snippet
|
||||
file mkdir [run_dir]/genode/launcher
|
||||
set fd [open [run_dir]/genode/launcher/$file w]
|
||||
puts $fd $content
|
||||
close $fd
|
||||
}
|
||||
|
||||
# wrap launcher snippets into tar archive and remove individual snippets
|
||||
exec tar cf [run_dir]/genode/launcher.tar -C [run_dir]/genode launcher
|
||||
exec rm -r [run_dir]/genode/launcher
|
||||
# support for the Leitzentrale GUI
|
||||
copy_file [genode_dir]/repos/gems/src/app/backdrop/genode_logo.png [run_dir]/genode/
|
||||
copy_file [genode_dir]/repos/gems/run/sculpt/drop_shadow.png [run_dir]/genode/
|
||||
|
||||
|
||||
#
|
||||
# Generate depot index from gems/run/sculpt/index
|
||||
#
|
||||
|
||||
set fd [open [genode_dir]/repos/gems/run/sculpt/index r]
|
||||
set pkg_index [read $fd]
|
||||
close $fd
|
||||
@ -750,28 +903,12 @@ puts $fd $pkg_index
|
||||
close $fd
|
||||
|
||||
|
||||
#
|
||||
# Assemble 'depot_users.tar' with the keys and download locations of the
|
||||
# depot user found at genode/depot/.
|
||||
#
|
||||
# Add current depot index of [depot_user] as generated above.
|
||||
#
|
||||
set depot_selection { genodelabs cnuke alex-ab mstein nfeske cproc chelmuth
|
||||
jschlatow ssumpf skalk }
|
||||
##
|
||||
## Create boot image
|
||||
##
|
||||
|
||||
set depot_users_files {}
|
||||
foreach user $depot_selection {
|
||||
lappend depot_users_files [file join depot $user pubkey] \
|
||||
[file join depot $user download] }
|
||||
build [ingredients_of_type build]
|
||||
|
||||
exec sh -c "tar cf [run_dir]/genode/depot_users.tar -C [genode_dir]/repos/gems/sculpt \
|
||||
[join $depot_users_files]"
|
||||
|
||||
|
||||
#
|
||||
# Create boot image
|
||||
#
|
||||
|
||||
append boot_modules { }
|
||||
append boot_modules [build_artifacts]
|
||||
|
||||
build_boot_image $boot_modules
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<VirtualBox xmlns="http://www.virtualbox.org/" version="1.14-freebsd">
|
||||
<Machine uuid="{37ab43a5-38d8-4491-93f5-5b0b077f5c32}" name="ubuntu_16_04_64" OSType="Ubuntu_64" snapshotFolder="Snapshots" lastStateChange="2018-01-23T18:40:00Z">
|
||||
<MediaRegistry>
|
||||
<HardDisks>
|
||||
<HardDisk uuid="{a90a16bf-f724-4321-99df-5498d6e4b796}" location="machine.vdi" format="VDI" type="Normal"/>
|
||||
</HardDisks>
|
||||
<DVDImages>
|
||||
<Image uuid="{81763434-9a51-49e8-9444-528a5a28c4bc}" location="installer.iso"/>
|
||||
</DVDImages>
|
||||
</MediaRegistry>
|
||||
<Hardware>
|
||||
<CPU count="2">
|
||||
<PAE enabled="true"/>
|
||||
<LongMode enabled="true"/>
|
||||
<HardwareVirtExLargePages enabled="false"/>
|
||||
</CPU>
|
||||
<Memory RAMSize="4096"/>
|
||||
<HID Pointing="USBTablet"/>
|
||||
<Display VRAMSize="20"/>
|
||||
<RemoteDisplay enabled="false"/>
|
||||
<BIOS>
|
||||
<IOAPIC enabled="true"/>
|
||||
</BIOS>
|
||||
<USB>
|
||||
<Controllers>
|
||||
<Controller name="OHCI" type="OHCI"/>
|
||||
</Controllers>
|
||||
</USB>
|
||||
<Network>
|
||||
<Adapter slot="0" enabled="true" MACAddress="0800271D7901" cable="true" type="82540EM">
|
||||
<BridgedInterface/>
|
||||
</Adapter>
|
||||
</Network>
|
||||
<UART>
|
||||
<Port slot="0" enabled="false" IOBase="0x3f8" IRQ="4" hostMode="Disconnected"/>
|
||||
<Port slot="1" enabled="false" IOBase="0x2f8" IRQ="3" hostMode="Disconnected"/>
|
||||
</UART>
|
||||
<LPT>
|
||||
<Port slot="0" enabled="false" IOBase="0x378" IRQ="7"/>
|
||||
<Port slot="1" enabled="false" IOBase="0x378" IRQ="7"/>
|
||||
</LPT>
|
||||
<AudioAdapter controller="HDA" driver="OSS" enabled="false"/>
|
||||
<RTC localOrUTC="UTC"/>
|
||||
<SharedFolders>
|
||||
<SharedFolder name="shared" hostPath="/shared" writable="true" autoMount="true"/>
|
||||
</SharedFolders>
|
||||
<Clipboard mode="Bidirectional"/>
|
||||
</Hardware>
|
||||
<StorageControllers>
|
||||
<StorageController name="SATA" type="AHCI" PortCount="4" useHostIOCache="true" Bootable="true" IDE0MasterEmulationPort="0" IDE0SlaveEmulationPort="1" IDE1MasterEmulationPort="2" IDE1SlaveEmulationPort="3">
|
||||
<AttachedDevice type="HardDisk" port="0" device="0">
|
||||
<Image uuid="{a90a16bf-f724-4321-99df-5498d6e4b796}"/>
|
||||
</AttachedDevice>
|
||||
<AttachedDevice passthrough="false" type="DVD" port="3" device="0">
|
||||
<Image uuid="{81763434-9a51-49e8-9444-528a5a28c4bc}"/>
|
||||
</AttachedDevice>
|
||||
</StorageController>
|
||||
</StorageControllers>
|
||||
</Machine>
|
||||
</VirtualBox>
|
||||
Binary file not shown.
10
repos/gems/sculpt/default-linux.sculpt
Normal file
10
repos/gems/sculpt/default-linux.sculpt
Normal file
@ -0,0 +1,10 @@
|
||||
# configuration decisions
|
||||
drivers: linux
|
||||
deploy: example
|
||||
ram_fs: depot
|
||||
|
||||
# selection of launcher-menu entries
|
||||
launcher: sticks_blue_backdrop nano3d system_shell
|
||||
|
||||
# supplemental depot content added to the system image
|
||||
import: pkg/drivers_interactive-linux
|
||||
14
repos/gems/sculpt/default-pc.sculpt
Normal file
14
repos/gems/sculpt/default-pc.sculpt
Normal file
@ -0,0 +1,14 @@
|
||||
# configuration decisions
|
||||
drivers: pc
|
||||
system: pc
|
||||
gpu_drv: intel
|
||||
|
||||
# supplemental depot content added to the system image
|
||||
import: pkg/drivers_managed-pc pkg/wifi src/ipxe_nic_drv
|
||||
|
||||
# selection of launcher-menu entries
|
||||
launcher: vm_fs shared_fs usb_devices_rom
|
||||
|
||||
# selection of accepted depot-package providers
|
||||
depot: genodelabs cnuke alex-ab mstein nfeske cproc chelmuth jschlatow
|
||||
depot: ssumpf skalk
|
||||
11
repos/gems/sculpt/deploy/default
Normal file
11
repos/gems/sculpt/deploy/default
Normal file
@ -0,0 +1,11 @@
|
||||
<config arch="">
|
||||
|
||||
<common_routes>
|
||||
<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
|
||||
<service name="CPU"> <parent/> </service>
|
||||
<service name="PD"> <parent/> </service>
|
||||
<service name="LOG"> <parent/> </service>
|
||||
<service name="Timer"> <parent/> </service>
|
||||
</common_routes>
|
||||
|
||||
</config>
|
||||
62
repos/gems/sculpt/deploy/example
Normal file
62
repos/gems/sculpt/deploy/example
Normal file
@ -0,0 +1,62 @@
|
||||
<config arch="">
|
||||
|
||||
<common_routes>
|
||||
<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
|
||||
<service name="ROM" label_last="init"> <parent/> </service>
|
||||
<service name="CPU"> <parent/> </service>
|
||||
<service name="PD"> <parent/> </service>
|
||||
<service name="LOG"> <parent/> </service>
|
||||
<service name="Timer"> <parent/> </service>
|
||||
</common_routes>
|
||||
|
||||
<start name="recall_fs" pkg="chroot">
|
||||
<route>
|
||||
<service name="File_system"> <child name="default_fs_rw"/> </service>
|
||||
</route>
|
||||
<config> <default-policy path_prefix="/recall" writeable="yes"/> </config>
|
||||
</start>
|
||||
|
||||
<start name="wm" pkg="wm">
|
||||
<route>
|
||||
<service name="ROM" label_last="clipboard"> <parent label="clipboard"/> </service>
|
||||
<service name="Report" label_last="clipboard"> <parent label="clipboard"/> </service>
|
||||
<service name="Report" label_last="shape"> <parent label="shape"/> </service>
|
||||
<service name="Gui" label="focus"> <parent label="focus"/> </service>
|
||||
<service name="Gui"> <parent/> </service>
|
||||
</route>
|
||||
</start>
|
||||
|
||||
<start name="window_layouter" pkg="window_layouter">
|
||||
<route>
|
||||
<service name="ROM" label="window_list"> <child name="wm"/> </service>
|
||||
<service name="ROM" label="focus_request"> <child name="wm"/> </service>
|
||||
<service name="ROM" label="hover"> <child name="wm"/> </service>
|
||||
<service name="ROM" label="decorator_margins"> <child name="wm"/> </service>
|
||||
<service name="ROM" label="rules"> <child name="wm"/> </service>
|
||||
<service name="Report"> <child name="wm"/> </service>
|
||||
<service name="Gui"> <child name="wm"/> </service>
|
||||
<service name="File_system" label="recall"> <child name="recall_fs"/> </service>
|
||||
</route>
|
||||
</start>
|
||||
|
||||
<start name="themed_decorator" pkg="themed_decorator">
|
||||
<route>
|
||||
<service name="ROM" label="window_layout"> <child name="wm"/> </service>
|
||||
<service name="ROM" label="pointer"> <child name="wm"/> </service>
|
||||
<service name="Report"> <child name="wm"/> </service>
|
||||
<service name="Gui"> <child name="wm"/> </service>
|
||||
</route>
|
||||
</start>
|
||||
|
||||
<start name="fonts_fs" pkg="fonts_fs">
|
||||
<route>
|
||||
<service name="ROM" label="config">
|
||||
<parent label="config -> managed/fonts"/> </service>
|
||||
</route>
|
||||
</start>
|
||||
|
||||
<start name="sticks_blue_backdrop"/>
|
||||
<start name="nano3d"/>
|
||||
<start name="system_shell"/>
|
||||
|
||||
</config>
|
||||
48
repos/gems/sculpt/drivers/linux
Normal file
48
repos/gems/sculpt/drivers/linux
Normal file
@ -0,0 +1,48 @@
|
||||
<config>
|
||||
<parent-provides>
|
||||
<service name="ROM"/>
|
||||
<service name="PD"/>
|
||||
<service name="CPU"/>
|
||||
<service name="LOG"/>
|
||||
<service name="Timer"/>
|
||||
<service name="Capture"/>
|
||||
<service name="Event"/>
|
||||
</parent-provides>
|
||||
|
||||
<start name="fb_sdl" caps="100" ld="no">
|
||||
<resource name="RAM" quantum="10M"/>
|
||||
<route>
|
||||
<service name="Event"> <child name="event_filter" label="sdl"/> </service>
|
||||
<any-service> <parent/> </any-service>
|
||||
</route>
|
||||
</start>
|
||||
|
||||
<!-- toggle key mappings depending on the numlock state -->
|
||||
<start name="numlock_remap_rom" caps="100">
|
||||
<binary name="rom_filter"/>
|
||||
<resource name="RAM" quantum="1M"/>
|
||||
<provides> <service name="ROM"/> </provides>
|
||||
<route>
|
||||
<service name="ROM" label="config"> <parent label="numlock_remap.config"/> </service>
|
||||
<service name="ROM" label="numlock"> <parent label="numlock"/> </service>
|
||||
<any-service> <parent/> </any-service>
|
||||
</route>
|
||||
</start>
|
||||
|
||||
<start name="event_filter" caps="120">
|
||||
<resource name="RAM" quantum="2M"/>
|
||||
<provides> <service name="Event"/> </provides>
|
||||
<route>
|
||||
<service name="ROM" label="config"> <parent label="event_filter.config"/> </service>
|
||||
<service name="ROM" label="numlock.remap"> <child name="numlock_remap_rom"/> </service>
|
||||
<service name="ROM" label="capslock"> <parent label="capslock"/> </service>
|
||||
<service name="ROM"> <parent/> </service>
|
||||
<service name="PD"> <parent/> </service>
|
||||
<service name="CPU"> <parent/> </service>
|
||||
<service name="LOG"> <parent/> </service>
|
||||
<service name="Timer"> <parent/> </service>
|
||||
<service name="Event"> <parent/> </service>
|
||||
</route>
|
||||
</start>
|
||||
|
||||
</config>
|
||||
15
repos/gems/sculpt/event_filter/default
Normal file
15
repos/gems/sculpt/event_filter/default
Normal file
@ -0,0 +1,15 @@
|
||||
<!-- this configuration is used only before the sculpt manager runs -->
|
||||
<config>
|
||||
<output>
|
||||
<merge>
|
||||
<input name="ps2"/>
|
||||
<input name="usb"/>
|
||||
<input name="touch"/>
|
||||
<input name="sdl"/>
|
||||
</merge>
|
||||
</output>
|
||||
<policy label="ps2" input="ps2"/>
|
||||
<policy label="usb" input="usb"/>
|
||||
<policy label="touch" input="touch"/>
|
||||
<policy label="sdl" input="sdl"/>
|
||||
</config>
|
||||
16
repos/gems/sculpt/global_keys/default
Normal file
16
repos/gems/sculpt/global_keys/default
Normal file
@ -0,0 +1,16 @@
|
||||
<config>
|
||||
<bool name="leitzentrale" initial="yes"/>
|
||||
<bool name="capslock" initial="no"/>
|
||||
<bool name="numlock" initial="no"/>
|
||||
<bool name="slides" initial="no"/>
|
||||
|
||||
<press name="KEY_PRESENTATION" bool="slides" change="toggle"/>
|
||||
<press name="KEY_DASHBOARD" bool="leitzentrale" change="toggle"/>
|
||||
<press name="KEY_CAPSLOCK" bool="capslock" change="toggle"/>
|
||||
<press name="KEY_NUMLOCK" bool="numlock" change="toggle"/>
|
||||
|
||||
<report name="leitzentrale"> <bool name="leitzentrale"/> </report>
|
||||
<report name="capslock"> <bool name="capslock"/> </report>
|
||||
<report name="numlock"> <bool name="numlock"/> </report>
|
||||
<report name="slides"> <bool name="slides"/> </report>
|
||||
</config>
|
||||
6
repos/gems/sculpt/launcher/nano3d
Normal file
6
repos/gems/sculpt/launcher/nano3d
Normal file
@ -0,0 +1,6 @@
|
||||
<launcher pkg="nano3d">
|
||||
<route>
|
||||
<service name="Gui"> <child name="wm"/> </service>
|
||||
</route>
|
||||
<config shape="cube"/>
|
||||
</launcher>
|
||||
6
repos/gems/sculpt/launcher/sticks_blue_backdrop
Normal file
6
repos/gems/sculpt/launcher/sticks_blue_backdrop
Normal file
@ -0,0 +1,6 @@
|
||||
<launcher name="backdrop" pkg="sticks_blue_backdrop">
|
||||
<route>
|
||||
<service name="Gui"> <parent label="backdrop"/> </service>
|
||||
</route>
|
||||
</launcher>
|
||||
|
||||
15
repos/gems/sculpt/launcher/system_shell
Normal file
15
repos/gems/sculpt/launcher/system_shell
Normal file
@ -0,0 +1,15 @@
|
||||
<launcher pkg="system_shell">
|
||||
<route>
|
||||
<service name="Gui"> <child name="wm"/> </service>
|
||||
<service name="File_system" label="fonts"> <child name="fonts_fs"/> </service>
|
||||
<service name="File_system" label="target"> <child name="default_fs_rw"/> </service>
|
||||
<service name="File_system" label="config"> <parent label="config"/> </service>
|
||||
<service name="File_system" label="report"> <parent label="report"/> </service>
|
||||
<service name="Report" label="clipboard"> <parent label="clipboard"/> </service>
|
||||
<service name="ROM" label="clipboard"> <parent label="clipboard"/> </service>
|
||||
<service name="ROM" label="vimrc"> <parent label="config -> vimrc"/> </service>
|
||||
<service name="ROM" label_last="cached_fs_rom">
|
||||
<parent label="cached_fs_rom"/> </service>
|
||||
<service name="RM"> <parent/> </service>
|
||||
</route>
|
||||
</launcher>
|
||||
6
repos/gems/sculpt/ram_fs/default
Normal file
6
repos/gems/sculpt/ram_fs/default
Normal file
@ -0,0 +1,6 @@
|
||||
<config>
|
||||
<vfs>
|
||||
<ram/>
|
||||
</vfs>
|
||||
<default-policy root="/" writeable="yes"/>
|
||||
</config>
|
||||
9
repos/gems/sculpt/ram_fs/depot
Normal file
9
repos/gems/sculpt/ram_fs/depot
Normal file
@ -0,0 +1,9 @@
|
||||
<config>
|
||||
<vfs>
|
||||
<ram/>
|
||||
<dir name="depot">
|
||||
<tar name="depot.tar"/>
|
||||
</dir>
|
||||
</vfs>
|
||||
<default-policy root="/" writeable="yes"/>
|
||||
</config>
|
||||
1
repos/gems/sculpt/system/default
Normal file
1
repos/gems/sculpt/system/default
Normal file
@ -0,0 +1 @@
|
||||
<system state=""/>
|
||||
3
repos/gems/sculpt/system/pc
Normal file
3
repos/gems/sculpt/system/pc
Normal file
@ -0,0 +1,3 @@
|
||||
<system state=""/>
|
||||
<!-- supported states: "poweroff" or "reset" when acpica started -->
|
||||
<!-- Note: power down your persistent Genode applications & VMs beforehand on your own ! -->
|
||||
@ -257,6 +257,9 @@ void Graph::generate(Xml_generator &xml) const
|
||||
|
||||
Start_name const name = component.name;
|
||||
|
||||
if (name == "ram_fs")
|
||||
return;
|
||||
|
||||
Runtime_state::Info const info = _runtime_state.info(name);
|
||||
|
||||
bool const show_details = info.tcb;
|
||||
|
||||
@ -77,9 +77,6 @@ static void gen_vfs_start(Xml_generator &xml,
|
||||
});
|
||||
});
|
||||
|
||||
gen_named_node(xml, "dir", "share", [&] () {
|
||||
gen_named_node(xml, "tar", "depot_users.tar"); });
|
||||
|
||||
auto fs_dir = [&] (String<64> const &label) {
|
||||
gen_named_node(xml, "dir", label, [&] () {
|
||||
xml.node("fs", [&] () { xml.attribute("label", label); }); }); };
|
||||
@ -271,7 +268,6 @@ void Sculpt::gen_inspect_view(Xml_generator &xml,
|
||||
gen_parent_rom_route(xml, "vim-minimal.tar");
|
||||
gen_parent_rom_route(xml, "ncurses.lib.so");
|
||||
gen_parent_rom_route(xml, "posix.lib.so");
|
||||
gen_parent_rom_route(xml, "depot_users.tar");
|
||||
gen_parent_rom_route(xml, "vimrc", "config -> vimrc");
|
||||
gen_parent_rom_route(xml, "VERSION");
|
||||
gen_parent_rom_route(xml, "Vera.ttf");
|
||||
|
||||
@ -31,7 +31,7 @@ void Sculpt::gen_prepare_vfs_start(Xml_generator &xml)
|
||||
"export VERSION=`cat /VERSION`\n"
|
||||
"cp -r /rw/config/$VERSION/* /config/\n"
|
||||
"mkdir -p /rw/depot\n"
|
||||
"cp -r depot/* /rw/depot\n"
|
||||
"cp -r /config/depot/* /rw/depot\n"
|
||||
"exit\n";
|
||||
|
||||
gen_provides<::File_system::Session>(xml);
|
||||
@ -41,7 +41,6 @@ void Sculpt::gen_prepare_vfs_start(Xml_generator &xml)
|
||||
xml.node("vfs", [&] () {
|
||||
gen_named_node(xml, "tar", "bash-minimal.tar");
|
||||
gen_named_node(xml, "tar", "coreutils-minimal.tar");
|
||||
gen_named_node(xml, "tar", "depot_users.tar");
|
||||
|
||||
gen_named_node(xml, "inline", ".bash_profile", [&] () {
|
||||
xml.append(script); });
|
||||
|
||||
@ -22,14 +22,6 @@ void Sculpt::gen_ram_fs_start_content(Xml_generator &xml,
|
||||
|
||||
gen_provides<::File_system::Session>(xml);
|
||||
|
||||
xml.node("config", [&] () {
|
||||
xml.node("vfs", [&] () { xml.node("ram", [&] () { }); });
|
||||
xml.node("default-policy", [&] () {
|
||||
xml.attribute("root", "/");
|
||||
xml.attribute("writeable", "yes");
|
||||
});
|
||||
});
|
||||
|
||||
xml.node("route", [&] () {
|
||||
gen_parent_rom_route(xml, "vfs");
|
||||
gen_parent_rom_route(xml, "ld.lib.so");
|
||||
@ -37,5 +29,7 @@ void Sculpt::gen_ram_fs_start_content(Xml_generator &xml,
|
||||
gen_parent_route<Cpu_session> (xml);
|
||||
gen_parent_route<Pd_session> (xml);
|
||||
gen_parent_route<Log_session> (xml);
|
||||
gen_parent_rom_route(xml, "config", "config -> ram_fs");
|
||||
gen_parent_route<Rom_session> (xml);
|
||||
});
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user