diff --git a/run/boot2java.run b/run/boot2java.run index b98e753..996100d 100644 --- a/run/boot2java.run +++ b/run/boot2java.run @@ -53,7 +53,7 @@ append config { - + @@ -62,6 +62,7 @@ append config { + @@ -122,6 +123,7 @@ append config { + @@ -269,15 +271,13 @@ install_config $config set boot_modules { core init ld.lib.so timer - gpio_drv sd_card_drv part_block + fec_nic_drv imx6_gpio_drv nit6_solox_sd_card_drv part_block fs_rom report_rom fs_log log_core nic_router } -append boot_modules [nic_drv_binary] - append_platform_drv_boot_modules build_boot_image $boot_modules diff --git a/run/dosbox.run b/run/dosbox.run index 46d9994..8f1cc55 100644 --- a/run/dosbox.run +++ b/run/dosbox.run @@ -1,36 +1,16 @@ -# -# Build -# - -set build_components { - core init - timer - drivers/audio - drivers/framebuffer drivers/input - app/dosbox -} - -source ${genode_dir}/repos/base/run/platform_drv.inc -# override default platform driver policy -proc platform_drv_policy {} { - return { - - - - } -} - -append_platform_drv_build_components - -build $build_components - create_boot_directory +build { app/dosbox } +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_interactive_pkg] \ + [depot_user]/src/init \ + [depot_user]/src/libc \ + [depot_user]/src/libpng \ + [depot_user]/src/sdl \ + [depot_user]/src/stdcxx \ + [depot_user]/src/vfs \ + [depot_user]/src/zlib -# -# Generate config -# - -append config { +install_config { @@ -45,49 +25,26 @@ append config { - } + -append_if [have_spec sdl] config { - - - - - - - - } - -append_platform_drv_config - -append_if [have_spec vesa] config { - - - - - } - -append_if [have_spec pl11x] config { - - - - } - -append_if [have_spec ps2] config { - - - - } - -append config { - - - - - + + + + + + + + + + + + + + @@ -102,8 +59,6 @@ append config { } -install_config $config - if {![file exists bin/dosbox.tar]} { puts "" puts "You need to provide 'bin/dosbox.tar' that contains the DOS game you want to" @@ -113,30 +68,5 @@ if {![file exists bin/dosbox.tar]} { exit 1 } -# -# Boot modules -# - -# generic modules -append boot_modules { - core init timer } [audio_drv_binary] { - ld.lib.so - libc.lib.so vfs.lib.so - libm.lib.so libpng.lib.so - stdcxx.lib.so sdl.lib.so sdl_net.lib.so zlib.lib.so - dosbox dosbox.tar -} - -# platform-specific modules -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec vesa] boot_modules fb_drv -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec pl11x] boot_modules fb_drv - -append_platform_drv_boot_modules - -build_boot_image $boot_modules - -append qemu_args " -soundhw es1370 " - +build_boot_image { dosbox dosbox.tar } run_genode_until forever diff --git a/run/drill.run b/run/drill.run index 2349dfa..e66d826 100644 --- a/run/drill.run +++ b/run/drill.run @@ -1,26 +1,26 @@ +assert_spec x86 + if {[have_spec linux]} { puts "The [run_name] scenario requires QEMU networking." exit 1 } -source ${genode_dir}/repos/base/run/platform_drv.inc - -set build_components { - core init - app/drill - timer - drivers/nic - drivers/rtc - lib/vfs/jitterentropy -} - -append_platform_drv_build_components - -build $build_components - create_boot_directory +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ + [depot_user]/src/init \ + [depot_user]/src/libc \ + [depot_user]/src/libcrypto \ + [depot_user]/src/libssl \ + [depot_user]/src/posix \ + [depot_user]/src/rtc_drv \ + [depot_user]/src/vfs_jitterentropy \ + [depot_user]/src/vfs_lxip \ + [depot_user]/src/vfs +build { app/drill } -append config { + +install_config { @@ -35,24 +35,29 @@ append config { - } + -append_platform_drv_config - -append config { - - - + + + + + + + + + + + @@ -74,27 +79,7 @@ append config { } -install_config $config - -set boot_modules { - core init ld.lib.so - drill - libc.lib.so vfs.lib.so - libcrypto.lib.so - libm.lib.so - libssl.lib.so - posix.lib.so - rtc_drv - timer - vfs_jitterentropy.lib.so - vfs_lxip.lib.so lxip.lib.so -} - -# platform-specific modules -append_platform_drv_boot_modules -lappend boot_modules [nic_drv_binary] - -build_boot_image $boot_modules +build_boot_image { drill } append qemu_args " -nographic -net nic,model=e1000 -net user -net dump,file=[run_dir]/dump.pcap" diff --git a/run/eigentor.run b/run/eigentor.run index aa98664..08a068a 100644 --- a/run/eigentor.run +++ b/run/eigentor.run @@ -12,26 +12,29 @@ assert_spec x86 if {![have_include power_on/qemu]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } -set build_components { - app/fetchurl - app/tor - core - drivers/nic - drivers/rtc - timer - init - lib/vfs/jitterentropy - server/dynamic_rom - server/nic_router - server/ram_fs -} - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components -build $build_components create_boot_directory +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ + [depot_user]/src/init \ + [depot_user]/src/curl \ + [depot_user]/src/dynamic_rom \ + [depot_user]/src/fetchurl \ + [depot_user]/src/libc \ + [depot_user]/src/libcrypto \ + [depot_user]/src/libssl \ + [depot_user]/src/libssh \ + [depot_user]/src/nic_router \ + [depot_user]/src/posix \ + [depot_user]/src/ram_fs \ + [depot_user]/src/report_rom \ + [depot_user]/src/rtc_drv \ + [depot_user]/src/vfs_jitterentropy \ + [depot_user]/src/vfs_lxip \ + [depot_user]/src/vfs \ + [depot_user]/src/zlib +build { app/tor } -set config { +install_config { @@ -57,14 +60,17 @@ set config { - } + -append_platform_drv_config - -append config { - - - + + + + + + + + + @@ -91,7 +97,7 @@ append config { - + @@ -158,11 +164,18 @@ DataDirectory /tor - + - - + + + 2000-01-01 00:00 + 01234567890123456789 + + + + + + @@ -189,36 +202,7 @@ DataDirectory /tor } -install_config $config - -set boot_modules { - core - curl.lib.so - dynamic_rom - fetchurl - init - ld.lib.so - libc.lib.so vfs.lib.so - posix.lib.so - libcrypto.lib.so - libevent.lib.so - libm.lib.so - libssh.lib.so - libssl.lib.so - lwip_legacy.lib.so - nic_drv - nic_router - pthread.lib.so - ram_fs - rtc_drv - timer - tor - vfs_jitterentropy.lib.so - zlib.lib.so -} -append_platform_drv_boot_modules -build_boot_image $boot_modules - +build_boot_image { libevent.lib.so tor } # # Prepare network environment @@ -234,9 +218,9 @@ if {[have_include power_on/qemu]} { if { [info exists ::env(ETH) ] } { set netdev $::env(ETH) } - exec sudo tunctl -u $username -t $tapdev > /dev/null - exec sudo ifconfig $tapdev up - exec sudo ifconfig $tapdev 10.1.1.1 netmask 255.255.255.0 + exec sudo ip tuntap add dev $tapdev mode tap user $username + exec sudo ip address flush dev $tapdev + exec sudo ip address add 10.1.1.1/24 dev $tapdev exec sudo iptables -t nat -A POSTROUTING -o $netdev -j MASQUERADE exec sudo iptables -A FORWARD -i $tapdev -o $netdev -j ACCEPT exec sudo iptables -A FORWARD -i $netdev -o $tapdev -m state --state RELATED,ESTABLISHED -j ACCEPT @@ -245,7 +229,6 @@ if {[have_include power_on/qemu]} { append qemu_args " -nographic -net nic,model=e1000 -net tap,ifname=tap0,downscript=no,script=no " } - # # Execute test case # @@ -263,8 +246,9 @@ if {[have_include power_on/qemu]} { exec sudo sysctl -w net.ipv4.ip_forward=0 >/dev/null exec sudo iptables -F exec sudo iptables -t nat -F - exec sudo ifconfig $tapdev down - exec sudo tunctl -d $tapdev >/dev/null + exec sudo ip link set $tapdev down + exec sudo ip address flush dev $tapdev + exec sudo ip tuntap del dev $tapdev mode tap } # vi: set ft=tcl : diff --git a/run/log_udp.run b/run/log_udp.run index ebf7b60..ab3d50a 100644 --- a/run/log_udp.run +++ b/run/log_udp.run @@ -1,28 +1,9 @@ -proc nic_drv_opt {} { - if {[have_spec linux]} { - return "ld=\"no\"" - } - return "" -} - -# -# Test logging to file system -# - -set build_components { - core init timer - proxy/log_udp - test/bomb - drivers/nic -} - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components - create_boot_directory - +build { proxy/log_udp } +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ + [depot_user]/src/init \ + [depot_user]/src/test-bomb install_config { @@ -40,34 +21,33 @@ install_config { + - - - - - - - + + + + + + + + + + + } -append boot_modules { - core init ld.lib.so bomb timer log_udp - } [nic_drv_binary] { -} - -append_platform_drv_boot_modules -build_boot_image $boot_modules +build_boot_image { log_udp } append qemu_args " -nographic" -append qemu_args " -net tap,ifname=tap1 " +append qemu_args " -net tap,ifname=tap0 " run_genode_until forever diff --git a/run/remote_rom_backend_nic_ip.run b/run/remote_rom_backend_nic_ip.run index 18bbe7d..661b73a 100644 --- a/run/remote_rom_backend_nic_ip.run +++ b/run/remote_rom_backend_nic_ip.run @@ -5,28 +5,14 @@ proc nic_drv_opt {} { return "" } -# -# Build -# - -set build_components { core init timer - server/dynamic_rom - proxy/remote_rom/backend/nic_ip - app/rom_logger - drivers/nic - server/nic_bridge -} - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components - create_boot_directory - -# -# Generate config -# +build { proxy/remote_rom/backend/nic_ip } +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ + [depot_user]/src/init \ + [depot_user]/src/nic_bridge \ + [depot_user]/src/dynamic_rom \ + [depot_user]/src/rom_logger install_config { @@ -40,6 +26,7 @@ install_config { + @@ -47,10 +34,23 @@ install_config { + + + + + + + + + + + + + @@ -69,6 +69,7 @@ install_config { + @@ -83,6 +84,7 @@ install_config { src="192.168.42.10" dst="192.168.42.11" /> + @@ -90,23 +92,17 @@ install_config { + - + - - - - - - - - + @@ -119,21 +115,7 @@ install_config { } -# -# Boot image -# - -append boot_modules { core ld.lib.so init timer - remote_rom_server - remote_rom_client - dynamic_rom - rom_logger - } [nic_drv_binary] { - nic_bridge -} - -append_platform_drv_boot_modules -build_boot_image $boot_modules +build_boot_image { remote_rom_server remote_rom_client } append qemu_args " -nographic " diff --git a/run/remote_rom_backend_nic_ip_client.run b/run/remote_rom_backend_nic_ip_client.run index 3bbd2f7..9cbe290 100644 --- a/run/remote_rom_backend_nic_ip_client.run +++ b/run/remote_rom_backend_nic_ip_client.run @@ -1,31 +1,12 @@ -proc nic_drv_opt {} { - if {[have_spec linux]} { - return "ld=\"no\"" - } - return "" -} - -# -# Build -# - -set build_components { core init timer +create_boot_directory +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ + [depot_user]/src/init +build { app/rom_logger proxy/remote_rom/backend/nic_ip/client - drivers/nic } -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components - -create_boot_directory - -# -# Generate config -# - install_config { @@ -48,6 +29,18 @@ install_config { + + + + + + + + + + + + @@ -58,6 +51,7 @@ install_config { + @@ -65,30 +59,12 @@ install_config { - - - - - - - - } -# -# Boot image -# - -append boot_modules { core ld.lib.so init timer +build_boot_image { remote_rom_client rom_logger - } [nic_drv_binary] { } - -append_platform_drv_boot_modules -build_boot_image $boot_modules - append qemu_args " -nographic " -append qemu_args " -net tap,ifname=tap2 " - +append qemu_args " -net tap,ifname=tap0 " run_genode_until forever diff --git a/run/remote_rom_backend_nic_ip_server.run b/run/remote_rom_backend_nic_ip_server.run index 76ba4e8..00fe221 100644 --- a/run/remote_rom_backend_nic_ip_server.run +++ b/run/remote_rom_backend_nic_ip_server.run @@ -1,30 +1,9 @@ -proc nic_drv_opt {} { - if {[have_spec linux]} { - return "ld=\"no\"" - } - return "" -} - -# -# Build -# - -set build_components { core init timer - server/dynamic_rom - proxy/remote_rom/backend/nic_ip/server - drivers/nic -} - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components - create_boot_directory - -# -# Generate config -# +build { proxy/remote_rom/backend/nic_ip/server } +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ + [depot_user]/src/init \ + [depot_user]/src/dynamic_rom install_config { @@ -44,10 +23,23 @@ install_config { + + + + + + + + + + + + + @@ -66,13 +58,14 @@ install_config { + - + @@ -80,30 +73,11 @@ install_config { src="192.168.42.10" dst="192.168.42.11" /> - - - - - - - - } -# -# Boot image -# - -append boot_modules { core ld.lib.so init timer - remote_rom_server - dynamic_rom - } [nic_drv_binary] { -} - -append_platform_drv_boot_modules -build_boot_image $boot_modules +build_boot_image { remote_rom_server } append qemu_args " -nographic " -append qemu_args " -net tap,ifname=tap2 " +append qemu_args " -net tap,ifname=tap0 " run_genode_until forever diff --git a/run/ssh_client.run b/run/ssh_client.run index 2b12d35..d5ef44f 100644 --- a/run/ssh_client.run +++ b/run/ssh_client.run @@ -3,11 +3,7 @@ # \author Emery Hemingway # -if {[have_spec odroid_xu] || [have_spec linux] || - [expr [have_spec imx53] && [have_spec trustzone]]} { - puts "Run script does not support this platform." - exit 0 -} +assert_spec x86 set build_components { app/ssh_client @@ -16,18 +12,9 @@ set build_components { lib/vfs/lwip } -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 } - -lappend_if [have_spec gpio] build_components drivers/gpio - source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components -lappend_if [expr {[nic_drv_binary] == "nic_drv"}] build_components drivers/nic -lappend_if [expr {[nic_drv_binary] == "usb_drv"}] build_components drivers/usb - build $build_components create_boot_directory @@ -59,26 +46,20 @@ append config { append_platform_drv_config -append_if [have_spec gpio] config " - - - - - " - append config { + - + - } [nic_drv_config] { + @@ -92,17 +73,17 @@ append config { - - - - - - - - - - - + + + + + + + + + + + @@ -147,6 +128,7 @@ install_config $config # generic modules set boot_modules { + ipxe_nic_drv libc.lib.so libcrypto.lib.so libm.lib.so @@ -160,18 +142,9 @@ set boot_modules { # platform-specific modules append_platform_drv_boot_modules - -lappend boot_modules [nic_drv_binary] - -lappend_if [have_spec ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv - -lappend_if [have_spec gpio] boot_modules [gpio_drv] - build_boot_image $boot_modules -append_if [have_spec x86] qemu_args " -net nic,model=e1000 " -append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " -append qemu_args " -net user -net dump,file=[run_dir].pcap" +append qemu_args " -net nic,model=e1000 " +append qemu_args " -net user -net dump,file=[run_dir].pcap" run_genode_until forever diff --git a/run/tftp_rom.run b/run/tftp_rom.run index 1182f13..0ff2e52 100644 --- a/run/tftp_rom.run +++ b/run/tftp_rom.run @@ -4,6 +4,7 @@ # \date 2016-02-24 # +assert_spec x86 if {![have_include "load/tftp"]} { puts "please enable TFTP booting first" exit 1 @@ -51,7 +52,7 @@ append config { - + @@ -115,7 +116,7 @@ set boot_modules { libc.lib.so vfs.lib.so libm.lib.so lwip_legacy.lib.so - nic_drv + ipxe_nic_drv test-libc tftp_rom timer diff --git a/run/tox_dht_bootstrap.run b/run/tox_dht_bootstrap.run index 1acdf7b..9383952 100644 --- a/run/tox_dht_bootstrap.run +++ b/run/tox_dht_bootstrap.run @@ -9,35 +9,18 @@ if {[have_spec odroid_xu] || [have_spec linux] || exit 0 } -set build_components { - app/tox_dht_bootstrap - drivers/nic - lib/vfs/import -} - -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 } - -lappend_if [have_spec gpio] build_components drivers/gpio - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -lappend_if [expr {[nic_drv_binary] == "nic_drv"}] build_components drivers/nic -lappend_if [expr {[nic_drv_binary] == "usb_drv"}] build_components drivers/usb - -build $build_components - create_boot_directory - +build { app/tox_dht_bootstrap lib/vfs/import } import_from_depot \ [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ [depot_user]/src/init \ + [depot_user]/src/libc \ + [depot_user]/src/vfs \ [depot_user]/src/vfs_lwip \ [depot_user]/src/report_rom \ -append config { +install_config { @@ -54,32 +37,27 @@ append config { - } + -append_platform_drv_config - -append_if [have_spec gpio] config " - - - - - " - -append config { - - - + + + + + + + + + - } [nic_drv_config] { - + @@ -112,27 +90,12 @@ append config { } -install_config $config - -# generic modules -set boot_modules { - libc.lib.so - libm.lib.so +build_boot_image { libsodium.lib.so c-toxcore.lib.so tox_dht_bootstrap - vfs.lib.so } -# platform-specific modules -append_platform_drv_boot_modules - -lappend boot_modules [nic_drv_binary] - -lappend_if [have_spec gpio] boot_modules [gpio_drv] - -build_boot_image $boot_modules - append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " append qemu_args " -net user -net dump,file=[run_dir].pcap" diff --git a/run/udp_log.run b/run/udp_log.run index 03fd8c9..e97100d 100644 --- a/run/udp_log.run +++ b/run/udp_log.run @@ -1,23 +1,8 @@ -if {[expr [have_spec linux]]} { - puts "\n Run script is not supported on this platform. \n"; exit 0 } - -# -# Test logging to file system -# - -set build_components { - core init timer - proxy/udp_log - test/bomb - drivers/nic -} - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components - create_boot_directory +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ + [depot_user]/src/init +build { proxy/udp_log test/bomb } install_config { @@ -35,16 +20,24 @@ install_config { + - - - - + + + + + + + + + + + @@ -52,6 +45,7 @@ install_config { + @@ -63,15 +57,9 @@ install_config { } -append boot_modules { - core init ld.lib.so bomb timer udp_log - } [nic_drv_binary] { -} - -append_platform_drv_boot_modules -build_boot_image $boot_modules +build_boot_image { bomb udp_log } append qemu_args " -nographic" -append qemu_args " -net tap,ifname=tap2 " +append qemu_args " -net tap,ifname=tap0 " run_genode_until forever diff --git a/run/umurmur.run b/run/umurmur.run index 9a41020..77fb663 100644 --- a/run/umurmur.run +++ b/run/umurmur.run @@ -3,30 +3,19 @@ if {![have_include power_on/qemu]} { exit 0 } -# -# Build -# - -set build_components { - core init - timer - drivers/nic - lib/vfs/lwip - app/umurmur -} - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components - create_boot_directory +build { app/umurmur } +import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/[drivers_nic_pkg] \ + [depot_user]/src/init \ + [depot_user]/src/libc \ + [depot_user]/src/libcrypto \ + [depot_user]/src/libssl \ + [depot_user]/src/posix \ + [depot_user]/src/vfs_lwip \ + [depot_user]/src/vfs -# -# Generate config -# - -set config { +install_config { @@ -45,14 +34,17 @@ set config { - } + -append_platform_drv_config - -append config { - - - + + + + + + + + + @@ -94,35 +86,10 @@ default_channel = "Lobby"; - } - -append config { + } -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core init timer nic_drv - ld.lib.so libc.lib.so vfs.lib.so vfs_lwip.lib.so - libcrypto.lib.so libssl.lib.so - libm.lib.so posix.lib.so - libconfig.lib.so protobuf-c.lib.so - umurmur -} - -# platform-specific modules -append_platform_drv_boot_modules - -build_boot_image $boot_modules - -# -# Execute test case -# +build_boot_image { libconfig.lib.so protobuf-c.lib.so umurmur } # qemu config append qemu_args " -nographic -net nic,model=e1000 " diff --git a/run/usb_gamepad_input.run b/run/usb_gamepad_input.run index dc99f9a..d1449ff 100644 --- a/run/usb_gamepad_input.run +++ b/run/usb_gamepad_input.run @@ -1,3 +1,4 @@ +assert_spec x86 set usb_raw_device "x.x" if {[have_include power_on/qemu]} { @@ -23,8 +24,6 @@ set build_components { test/input } -lappend_if [have_spec gpio] build_components drivers/gpio - source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components @@ -56,13 +55,6 @@ set config { append_platform_drv_config -append_if [have_spec gpio] config { - - - - - } - append config {