diff --git a/repos/ports/run/noux_bash.run b/repos/ports/run/noux_bash.run index 842dabde9..eedc88723 100644 --- a/repos/ports/run/noux_bash.run +++ b/repos/ports/run/noux_bash.run @@ -1,34 +1,20 @@ -set build_components { - core init drivers/timer noux/minimal lib/libc_noux - drivers/framebuffer drivers/input - server/terminal server/ram_fs - test/libports/ncurses -} - -source ${genode_dir}/repos/base/run/platform_drv.inc - -lappend_if [have_spec x86] build_components drivers/rtc -lappend_if [need_usb_hid] build_components drivers/usb -lappend_if [have_spec gpio] build_components drivers/gpio - -proc gpio_drv { } { if {[have_spec rpi] && [have_spec hw]} { return hw_gpio_drv } - if {[have_spec rpi] && [have_spec foc]} { return foc_gpio_drv } - return gpio_drv } - -# -# Build Noux packages only once -# -foreach pkg {bash coreutils vim diffutils less} { - lappend_if [expr ![file exists bin/$pkg]] build_components noux-pkg/$pkg } - -append_platform_drv_build_components - -build $build_components - create_boot_directory +import_from_depot genodelabs/src/[base_src] \ + genodelabs/pkg/[drivers_interactive_pkg] \ + genodelabs/src/init \ + genodelabs/src/libc \ + genodelabs/src/noux \ + genodelabs/src/terminal \ + genodelabs/src/posix \ + genodelabs/src/ncurses \ + genodelabs/src/vim \ + genodelabs/src/bash \ + genodelabs/src/coreutils \ + genodelabs/src/ram_fs + # write default vimrc file -set vimrc_fd [open bin/vimrc w] +set vimrc_fd [open [run_dir]/genode/vimrc w] puts $vimrc_fd { set noloadplugins set hls @@ -38,81 +24,52 @@ set noswapfile set viminfo=} close $vimrc_fd -append config { - - - - - - - - - - - - - - - - - - - } +install_config { + + + + + + + + + + + -append_if [have_spec x86] config { - - - - } + + + -append_if [have_spec sdl] config { - - - - - - - - } + -append_platform_drv_config - -append_if [have_spec framebuffer] config { - - - - - } - -append_if [have_spec ps2] config { - + - - } + + -append_if [have_spec gpio] config " - - - - - " + + + + + + + + + + + + -append_if [need_usb_hid] config { - - - - - } - -append config { - + + @@ -141,14 +98,13 @@ Hello world !! + - - - + + + + + - - + + + + + + - - + + - - - + + - - - + + - - - - -} + + + -install_config $config + + + + + + +} -# -# Boot modules -# - -# generic modules -set boot_modules { - core init timer ld.lib.so noux terminal - libc.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so posix.lib.so - vim.tar -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv - -append_platform_drv_boot_modules - -build_boot_image $boot_modules +build_boot_image { } run_genode_until forever