ports: use depot in noux_vim.run, noux_bash.run
This commit is contained in:
parent
ea21576eac
commit
c6690ea447
|
@ -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
|
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
|
# write default vimrc file
|
||||||
set vimrc_fd [open bin/vimrc w]
|
set vimrc_fd [open [run_dir]/genode/vimrc w]
|
||||||
puts $vimrc_fd {
|
puts $vimrc_fd {
|
||||||
set noloadplugins
|
set noloadplugins
|
||||||
set hls
|
set hls
|
||||||
|
@ -38,81 +24,52 @@ set noswapfile
|
||||||
set viminfo=}
|
set viminfo=}
|
||||||
close $vimrc_fd
|
close $vimrc_fd
|
||||||
|
|
||||||
append config {
|
install_config {
|
||||||
<config verbose="yes">
|
<config verbose="yes">
|
||||||
<parent-provides>
|
<parent-provides>
|
||||||
<service name="ROM"/>
|
<service name="ROM"/>
|
||||||
<service name="LOG"/>
|
<service name="LOG"/>
|
||||||
<service name="RM"/>
|
<service name="RM"/>
|
||||||
<service name="CPU"/>
|
<service name="CPU"/>
|
||||||
<service name="PD"/>
|
<service name="PD"/>
|
||||||
<service name="IRQ"/>
|
<service name="IRQ"/>
|
||||||
<service name="IO_PORT"/>
|
<service name="IO_PORT"/>
|
||||||
<service name="IO_MEM"/>
|
<service name="IO_MEM"/>
|
||||||
</parent-provides>
|
</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_if [have_spec x86] config {
|
<default-route>
|
||||||
<start name="rtc_drv">
|
<any-service> <parent/> <any-child/> </any-service>
|
||||||
<resource name="RAM" quantum="1M"/>
|
</default-route>
|
||||||
<provides><service name="Rtc"/></provides>
|
|
||||||
</start>}
|
|
||||||
|
|
||||||
append_if [have_spec sdl] config {
|
<default caps="100"/>
|
||||||
<start name="fb_sdl">
|
|
||||||
<resource name="RAM" quantum="4M"/>
|
|
||||||
<provides>
|
|
||||||
<service name="Input"/>
|
|
||||||
<service name="Framebuffer"/>
|
|
||||||
</provides>
|
|
||||||
<config width="640" height="480"/>
|
|
||||||
</start>}
|
|
||||||
|
|
||||||
append_platform_drv_config
|
<start name="timer">
|
||||||
|
|
||||||
append_if [have_spec framebuffer] config {
|
|
||||||
<start name="fb_drv" caps="200">
|
|
||||||
<resource name="RAM" quantum="4M"/>
|
|
||||||
<provides><service name="Framebuffer"/></provides>
|
|
||||||
<config width="640" height="480"/>
|
|
||||||
</start>}
|
|
||||||
|
|
||||||
append_if [have_spec ps2] config {
|
|
||||||
<start name="ps2_drv">
|
|
||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
<provides><service name="Input"/></provides>
|
<provides><service name="Timer"/></provides>
|
||||||
</start> }
|
</start>
|
||||||
|
|
||||||
append_if [have_spec gpio] config "
|
<start name="drivers" caps="1000">
|
||||||
<start name=\"[gpio_drv]\">
|
<resource name="RAM" quantum="32M"/>
|
||||||
<resource name=\"RAM\" quantum=\"4M\"/>
|
<binary name="init"/>
|
||||||
<provides><service name=\"Gpio\"/></provides>
|
<route>
|
||||||
<config/>
|
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
|
||||||
</start>"
|
<service name="Timer"> <child name="timer"/> </service>
|
||||||
|
<any-service> <parent/> </any-service>
|
||||||
|
</route>
|
||||||
|
<provides>
|
||||||
|
<service name="Input"/> <service name="Framebuffer"/>
|
||||||
|
</provides>
|
||||||
|
</start>
|
||||||
|
|
||||||
append_if [need_usb_hid] config {
|
|
||||||
<start name="usb_drv">
|
|
||||||
<resource name="RAM" quantum="12M"/>
|
|
||||||
<provides><service name="Input"/></provides>
|
|
||||||
<config uhci="yes" ehci="yes" xhci="yes"> <hid/> </config>
|
|
||||||
</start> }
|
|
||||||
|
|
||||||
append config {
|
|
||||||
<start name="terminal">
|
<start name="terminal">
|
||||||
<resource name="RAM" quantum="2M"/>
|
<resource name="RAM" quantum="2M"/>
|
||||||
<provides><service name="Terminal"/></provides>
|
<provides><service name="Terminal"/></provides>
|
||||||
<config>
|
<config>
|
||||||
<keyboard layout="de"/>
|
<keyboard layout="none"/>
|
||||||
<font size="12" />
|
<font size="12" />
|
||||||
</config>
|
</config>
|
||||||
</start>
|
</start>
|
||||||
|
|
||||||
<start name="ram_fs">
|
<start name="ram_fs">
|
||||||
<resource name="RAM" quantum="10M"/>
|
<resource name="RAM" quantum="10M"/>
|
||||||
<provides><service name="File_system"/></provides>
|
<provides><service name="File_system"/></provides>
|
||||||
|
@ -141,14 +98,13 @@ Hello world !!
|
||||||
<policy label="noux -> tmp" root="/tmp" writeable="yes" />
|
<policy label="noux -> tmp" root="/tmp" writeable="yes" />
|
||||||
</config>
|
</config>
|
||||||
</start>
|
</start>
|
||||||
|
|
||||||
<start name="noux" caps="1000">
|
<start name="noux" caps="1000">
|
||||||
<resource name="RAM" quantum="1G" />
|
<resource name="RAM" quantum="1G" />
|
||||||
<config>
|
<config>
|
||||||
<fstab>
|
<fstab>
|
||||||
<tar name="coreutils.tar" />
|
<tar name="coreutils.tar" />
|
||||||
<tar name="vim.tar" />
|
<tar name="vim.tar" />
|
||||||
<tar name="diffutils.tar" />
|
|
||||||
<tar name="less.tar" />
|
|
||||||
<tar name="bash.tar" />
|
<tar name="bash.tar" />
|
||||||
|
|
||||||
<!-- Example of how to impose policy onto a file system
|
<!-- Example of how to impose policy onto a file system
|
||||||
|
@ -164,11 +120,7 @@ Hello world !!
|
||||||
<dir name="ram"> <fs label="root" /> </dir>
|
<dir name="ram"> <fs label="root" /> </dir>
|
||||||
<dir name="tmp"> <fs label="tmp" /> </dir>
|
<dir name="tmp"> <fs label="tmp" /> </dir>
|
||||||
|
|
||||||
<dir name="dev">}
|
<dir name="dev">
|
||||||
|
|
||||||
append_if [have_spec x86] config {
|
|
||||||
<rtc/>}
|
|
||||||
append config {
|
|
||||||
<zero/> <null/>
|
<zero/> <null/>
|
||||||
</dir>
|
</dir>
|
||||||
</fstab>
|
</fstab>
|
||||||
|
@ -177,37 +129,8 @@ append config {
|
||||||
</start>
|
</start>
|
||||||
</config>
|
</config>
|
||||||
</start>
|
</start>
|
||||||
</config>
|
</config>}
|
||||||
}
|
|
||||||
|
|
||||||
install_config $config
|
build_boot_image { }
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# Boot modules
|
|
||||||
#
|
|
||||||
|
|
||||||
# generic modules
|
|
||||||
set boot_modules {
|
|
||||||
core init timer ld.lib.so noux terminal ram_fs
|
|
||||||
libc.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so posix.lib.so
|
|
||||||
bash.tar coreutils.tar diffutils.tar less.tar vim.tar vimrc
|
|
||||||
}
|
|
||||||
|
|
||||||
# platform-specific modules
|
|
||||||
lappend_if [have_spec linux] boot_modules fb_sdl
|
|
||||||
lappend_if [have_spec ps2] boot_modules ps2_drv
|
|
||||||
lappend_if [have_spec x86] boot_modules rtc_drv
|
|
||||||
lappend_if [have_spec framebuffer] boot_modules fb_drv
|
|
||||||
lappend_if [need_usb_hid] boot_modules usb_drv
|
|
||||||
lappend_if [have_spec gpio] boot_modules [gpio_drv]
|
|
||||||
|
|
||||||
append_platform_drv_boot_modules
|
|
||||||
|
|
||||||
build_boot_image $boot_modules
|
|
||||||
|
|
||||||
if {[have_spec x86_64]} {
|
|
||||||
# bash.tar is really huge when built for x86_64
|
|
||||||
}
|
|
||||||
|
|
||||||
run_genode_until forever
|
run_genode_until forever
|
||||||
|
|
|
@ -1,130 +1,90 @@
|
||||||
#
|
|
||||||
# Uncomment the following line when working on the VIM source code. Otherwise,
|
|
||||||
# VIM may get recompiled, yet it does not get reinstalled into 'bin/vim'.
|
|
||||||
#
|
|
||||||
#exec rm -rf noux-pkg/vim bin/vim
|
|
||||||
|
|
||||||
set build_components {
|
|
||||||
core init drivers/timer noux/minimal lib/libc_noux
|
|
||||||
drivers/framebuffer drivers/input
|
|
||||||
server/terminal
|
|
||||||
}
|
|
||||||
lappend build_components noux-pkg/vim
|
|
||||||
lappend build_components test/libports/ncurses
|
|
||||||
|
|
||||||
source ${genode_dir}/repos/base/run/platform_drv.inc
|
|
||||||
append_platform_drv_build_components
|
|
||||||
|
|
||||||
build $build_components
|
|
||||||
|
|
||||||
create_boot_directory
|
create_boot_directory
|
||||||
|
|
||||||
append config {
|
import_from_depot genodelabs/src/[base_src] \
|
||||||
<config verbose="yes">
|
genodelabs/pkg/[drivers_interactive_pkg] \
|
||||||
<parent-provides>
|
genodelabs/src/init \
|
||||||
<service name="ROM"/>
|
genodelabs/src/libc \
|
||||||
<service name="LOG"/>
|
genodelabs/src/noux \
|
||||||
<service name="RM"/>
|
genodelabs/src/terminal \
|
||||||
<service name="CPU"/>
|
genodelabs/src/posix \
|
||||||
<service name="PD"/>
|
genodelabs/src/ncurses \
|
||||||
<service name="IRQ"/>
|
genodelabs/src/vim
|
||||||
<service name="IO_PORT"/>
|
|
||||||
<service name="IO_MEM"/>
|
|
||||||
</parent-provides>
|
|
||||||
<default-route>
|
|
||||||
<any-service> <parent/> <any-child/> </any-service>
|
|
||||||
</default-route>
|
|
||||||
<default caps="50"/>
|
|
||||||
<start name="timer">
|
|
||||||
<resource name="RAM" quantum="1M"/>
|
|
||||||
<provides><service name="Timer"/></provides>
|
|
||||||
</start> }
|
|
||||||
|
|
||||||
append_if [have_spec sdl] config {
|
install_config {
|
||||||
<start name="fb_sdl">
|
<config verbose="yes">
|
||||||
<resource name="RAM" quantum="4M"/>
|
<parent-provides>
|
||||||
<provides>
|
<service name="ROM"/>
|
||||||
<service name="Input"/>
|
<service name="LOG"/>
|
||||||
<service name="Framebuffer"/>
|
<service name="RM"/>
|
||||||
</provides>
|
<service name="CPU"/>
|
||||||
</start>}
|
<service name="PD"/>
|
||||||
|
<service name="IRQ"/>
|
||||||
append_platform_drv_config
|
<service name="IO_PORT"/>
|
||||||
|
<service name="IO_MEM"/>
|
||||||
|
</parent-provides>
|
||||||
|
|
||||||
append_if [have_spec framebuffer] config {
|
<default-route>
|
||||||
<start name="fb_drv">
|
<any-service> <parent/> <any-child/> </any-service>
|
||||||
<resource name="RAM" quantum="4M"/>
|
</default-route>
|
||||||
<provides><service name="Framebuffer"/></provides>
|
|
||||||
</start>}
|
|
||||||
|
|
||||||
append_if [have_spec ps2] config {
|
<default caps="100"/>
|
||||||
<start name="ps2_drv">
|
|
||||||
|
<start name="timer">
|
||||||
<resource name="RAM" quantum="1M"/>
|
<resource name="RAM" quantum="1M"/>
|
||||||
<provides><service name="Input"/></provides>
|
<provides><service name="Timer"/></provides>
|
||||||
</start> }
|
</start>
|
||||||
|
|
||||||
append config {
|
<start name="drivers" caps="1000">
|
||||||
<start name="terminal">
|
<resource name="RAM" quantum="32M"/>
|
||||||
<resource name="RAM" quantum="2M"/>
|
<binary name="init"/>
|
||||||
<provides><service name="Terminal"/></provides>
|
<route>
|
||||||
<config>
|
<service name="ROM" label="config"> <parent label="drivers.config"/> </service>
|
||||||
<keyboard layout="de"/>
|
<service name="Timer"> <child name="timer"/> </service>
|
||||||
</config>
|
<any-service> <parent/> </any-service>
|
||||||
</start>
|
</route>
|
||||||
<start name="noux">
|
<provides>
|
||||||
<resource name="RAM" quantum="1G"/>
|
<service name="Input"/> <service name="Framebuffer"/>
|
||||||
<config>
|
</provides>
|
||||||
<fstab> <tar name="vim.tar" /> </fstab>
|
</start>
|
||||||
<start name="/bin/vim">
|
|
||||||
<env name="TERM" value="linux" />
|
|
||||||
|
|
||||||
<!-- Deactivate the loading of plugins. Otherwise, vim will
|
<start name="terminal">
|
||||||
attempt to use a sub shell for pattern matching -->
|
<resource name="RAM" quantum="2M"/>
|
||||||
<arg value="--noplugin" />
|
<provides><service name="Terminal"/></provides>
|
||||||
|
<config> <keyboard layout="none"/> </config>
|
||||||
|
</start>
|
||||||
|
|
||||||
<!-- Do not use swap file. Any attempt to create of would
|
<start name="noux" caps="1000">
|
||||||
fail because we are on a read-only file system -->
|
<resource name="RAM" quantum="1G"/>
|
||||||
<arg value="-n" />
|
<config>
|
||||||
|
<fstab> <tar name="vim.tar" /> </fstab>
|
||||||
|
<start name="/bin/vim">
|
||||||
|
<env name="TERM" value="linux" />
|
||||||
|
|
||||||
<!-- Use the nocompatible mode, which is much nicer than
|
<!-- Deactivate the loading of plugins. Otherwise, vim will
|
||||||
the plain vi mode -->
|
attempt to use a sub shell for pattern matching -->
|
||||||
<arg value="-N" />
|
<arg value="--noplugin" />
|
||||||
|
|
||||||
<!-- Permanently display status bar -->
|
<!-- Do not use swap file. Any attempt to create of would
|
||||||
<arg value="--cmd" />
|
fail because we are on a read-only file system -->
|
||||||
<arg value="set laststatus=2" />
|
<arg value="-n" />
|
||||||
|
|
||||||
<!-- Enable highlighted search results -->
|
<!-- Use the nocompatible mode, which is much nicer than
|
||||||
<arg value="--cmd" />
|
the plain vi mode -->
|
||||||
<arg value="set hls" />
|
<arg value="-N" />
|
||||||
|
|
||||||
</start>
|
<!-- Permanently display status bar -->
|
||||||
</config>
|
<arg value="--cmd" />
|
||||||
</start>
|
<arg value="set laststatus=2" />
|
||||||
</config>
|
|
||||||
}
|
|
||||||
|
|
||||||
install_config $config
|
<!-- Enable highlighted search results -->
|
||||||
|
<arg value="--cmd" />
|
||||||
|
<arg value="set hls" />
|
||||||
|
|
||||||
|
</start>
|
||||||
|
</config>
|
||||||
|
</start>
|
||||||
|
</config>}
|
||||||
|
|
||||||
#
|
build_boot_image { }
|
||||||
# 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
|
|
||||||
|
|
||||||
run_genode_until forever
|
run_genode_until forever
|
||||||
|
|
Loading…
Reference in New Issue