diff --git a/repos/gems/recipes/pkg/sculpt-installation/archives b/repos/gems/recipes/pkg/sculpt-installation/archives index 418fd937d..08a525427 100644 --- a/repos/gems/recipes/pkg/sculpt-installation/archives +++ b/repos/gems/recipes/pkg/sculpt-installation/archives @@ -1,4 +1,4 @@ -_/pkg/noux-system +_/pkg/system_shell _/pkg/wifi _/pkg/ipxe_nic_drv _/pkg/chroot diff --git a/repos/gems/run/depot_deploy.run b/repos/gems/run/depot_deploy.run index 36efccf83..96659e44d 100644 --- a/repos/gems/run/depot_deploy.run +++ b/repos/gems/run/depot_deploy.run @@ -88,6 +88,7 @@ install_config { + @@ -111,7 +112,7 @@ install_config { - + @@ -142,6 +143,7 @@ install_config { + @@ -209,21 +211,24 @@ install_config { - @@ -231,18 +236,22 @@ install_config { + + - + + + @@ -257,6 +266,7 @@ install_config { build { app/depot_query app/depot_deploy } file copy -force [genode_dir]/repos/gems/run/sculpt/fonts.config [run_dir]/genode/ +file copy -force [genode_dir]/repos/ports/recipes/raw/system_shell/system_shell.config [run_dir]/genode/ # # Pin the nitpicker focus to the window manager by providing a static focus ROM @@ -265,6 +275,17 @@ set fd [open [run_dir]/genode/focus w] puts $fd " wm -> focus\"/>" close $fd +# write default vimrc file +set vimrc_fd [open [run_dir]/genode/vimrc w] +puts $vimrc_fd { +set noloadplugins +set hls +set nocompatible +set laststatus=2 +set noswapfile +set viminfo=} +close $vimrc_fd + build_boot_image { depot_query depot_deploy } run_genode_until forever diff --git a/repos/gems/run/sculpt/index b/repos/gems/run/sculpt/index index 26a69efc9..2fd2c9d59 100644 --- a/repos/gems/run/sculpt/index +++ b/repos/gems/run/sculpt/index @@ -11,7 +11,7 @@ - + diff --git a/repos/ports/recipes/pkg/noux-system/README b/repos/ports/recipes/pkg/system_shell/README similarity index 65% rename from repos/ports/recipes/pkg/noux-system/README rename to repos/ports/recipes/pkg/system_shell/README index 84eea89ab..8b296694d 100644 --- a/repos/ports/recipes/pkg/noux-system/README +++ b/repos/ports/recipes/pkg/system_shell/README @@ -1,3 +1,3 @@ -Noux runtime that allows the user to interact with a 'report' file system +Unix runtime that allows the user to interact with a 'report' file system (mounted at /report), a 'config' file system (mounted at /config), and a 'target' file system (mounted at /rw). diff --git a/repos/ports/recipes/pkg/noux-system/archives b/repos/ports/recipes/pkg/system_shell/archives similarity index 74% rename from repos/ports/recipes/pkg/noux-system/archives rename to repos/ports/recipes/pkg/system_shell/archives index 0a4aa477d..f1f1e86fc 100644 --- a/repos/ports/recipes/pkg/noux-system/archives +++ b/repos/ports/recipes/pkg/system_shell/archives @@ -1,4 +1,4 @@ -_/raw/noux-system +_/raw/system_shell _/src/noux _/src/bash-minimal _/src/vim-minimal @@ -10,3 +10,5 @@ _/src/nit_fb _/src/terminal _/src/init _/src/vfs +_/src/vfs_pipe +_/src/cached_fs_rom diff --git a/repos/ports/recipes/pkg/noux-system/hash b/repos/ports/recipes/pkg/system_shell/hash similarity index 100% rename from repos/ports/recipes/pkg/noux-system/hash rename to repos/ports/recipes/pkg/system_shell/hash diff --git a/repos/ports/recipes/pkg/noux-system/runtime b/repos/ports/recipes/pkg/system_shell/runtime similarity index 77% rename from repos/ports/recipes/pkg/noux-system/runtime rename to repos/ports/recipes/pkg/system_shell/runtime index f29eab301..f155ad327 100644 --- a/repos/ports/recipes/pkg/noux-system/runtime +++ b/repos/ports/recipes/pkg/system_shell/runtime @@ -1,4 +1,4 @@ - + @@ -10,18 +10,20 @@ + - + + + + - - diff --git a/repos/ports/recipes/raw/noux-system/content.mk b/repos/ports/recipes/raw/noux-system/content.mk deleted file mode 100644 index e605f66f4..000000000 --- a/repos/ports/recipes/raw/noux-system/content.mk +++ /dev/null @@ -1,4 +0,0 @@ -content: noux-system.config - -noux-system.config: - cp $(REP_DIR)/recipes/raw/noux-system/$@ $@ diff --git a/repos/ports/recipes/raw/system_shell/content.mk b/repos/ports/recipes/raw/system_shell/content.mk new file mode 100644 index 000000000..3dc578ed3 --- /dev/null +++ b/repos/ports/recipes/raw/system_shell/content.mk @@ -0,0 +1,4 @@ +content: system_shell.config + +system_shell.config: + cp $(REP_DIR)/recipes/raw/system_shell/$@ $@ diff --git a/repos/ports/recipes/raw/noux-system/hash b/repos/ports/recipes/raw/system_shell/hash similarity index 100% rename from repos/ports/recipes/raw/noux-system/hash rename to repos/ports/recipes/raw/system_shell/hash diff --git a/repos/ports/recipes/raw/noux-system/noux-system.config b/repos/ports/recipes/raw/system_shell/system_shell.config similarity index 57% rename from repos/ports/recipes/raw/noux-system/noux-system.config rename to repos/ports/recipes/raw/system_shell/system_shell.config index 0a20c9c2f..f8b0b1302 100644 --- a/repos/ports/recipes/raw/noux-system/noux-system.config +++ b/repos/ports/recipes/raw/system_shell/system_shell.config @@ -39,25 +39,30 @@ - - - + + + - + - + + + + 2018-01-01 00:01 + - - - - - - + + + + + + + @@ -68,4 +73,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +