diff --git a/repos/ports/run/virtualbox_nic_router.run b/repos/ports/run/virtualbox_nic_router.run index e2219ec36..76e4fb30c 100644 --- a/repos/ports/run/virtualbox_nic_router.run +++ b/repos/ports/run/virtualbox_nic_router.run @@ -1,29 +1,31 @@ -set use_net 1 -set use_ps2 [have_spec ps2] -set use_serial 1 +if {[expr ![have_spec nova] || ![have_spec x86] || [have_include power_on/qemu] ]} { + puts "\n Run script is not supported on this platform. \n"; exit 0 } -set build_components { - core init - drivers/framebuffer - drivers/timer - server/nic_dump - server/nic_router -} +proc wifi_ssid {} { + return "$::env(GENODE_WIFI_SSID)" } -append build_components virtualbox -set virtualbox_binary "virtualbox-rem" -if {[have_spec muen]} { set virtualbox_binary "virtualbox-muen" } -if {[have_spec nova]} { set virtualbox_binary "virtualbox-nova" } +proc wifi_psk {} { + return "$::env(GENODE_WIFI_PSK)" } source ${genode_dir}/repos/base/run/platform_drv.inc -# override defaults of platform_drv.inc proc platform_drv_priority {} { return { priority="-1"} } -lappend_if [expr $use_ps2] build_components drivers/input -lappend_if [expr $use_serial] build_components server/log_terminal -lappend_if [have_spec x86] build_components drivers/rtc - -lappend_if [expr $use_net] build_components drivers/nic +append build_components { core } +append build_components { init } +append build_components { drivers/framebuffer } +append build_components { drivers/timer } +append build_components { server/nic_router } +append build_components { virtualbox } +append build_components { server/dynamic_rom } +append build_components { server/report_rom } +append build_components { drivers/wifi } +append build_components { server/log_terminal } +append build_components { lib/vfs/jitterentropy } +append build_components { drivers/input } +append build_components { drivers/rtc } +append build_components { drivers/usb } +append build_components { drivers/nic } +append build_components { server/input_merger } append_platform_drv_build_components @@ -31,7 +33,8 @@ build $build_components create_boot_directory -set config { +append config { + @@ -41,146 +44,301 @@ set config { - } - -append_if [have_spec muen] config { - } - -append config { + - - - - - } + } append_platform_drv_config +append config { + + + + + -append_if [expr $use_ps2] config { - } + -append_if [have_spec framebuffer] config { - } + -append_if [have_spec sdl] config { - - - - - - - } - -append_if [have_spec x86] config { - } + + + + + + + -append_if [expr $use_net] config { - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + -} -append_if [expr $use_serial] config { -} -append config { - } -append config " - " -append config { + + - } - -append_if [expr $use_serial] config { - } - -append config { + + + + @@ -191,33 +349,49 @@ install_config $config exec cp ${genode_dir}/repos/ports/run/virtualbox_nic_router.vbox bin/. -set boot_modules { core nic_dump nic_router ld.lib.so init timer test.iso virtualbox_nic_router.vbox } - -append boot_modules $virtualbox_binary - -# platform-specific modules -lappend_if [expr $use_ps2] boot_modules ps2_drv -lappend_if [have_spec framebuffer] boot_modules fb_drv -lappend_if [have_spec linux] boot_modules fb_sdl -lappend_if [have_spec x86] boot_modules rtc_drv - -append boot_modules { - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so - libc_terminal.lib.so libiconv.lib.so stdcxx.lib.so - qemu-usb.lib.so -} - -append_if [expr $use_net] boot_modules { nic_drv } -append_if [expr $use_serial] boot_modules { log_terminal } - +append boot_modules { virtualbox-nova } +append boot_modules { iwlwifi-6000-4.ucode } +append boot_modules { iwlwifi-6000g2a-6.ucode } +append boot_modules { iwlwifi-6000g2b-6.ucode } +append boot_modules { iwlwifi-7260-16.ucode } +append boot_modules { iwlwifi-7265-16.ucode } +append boot_modules { iwlwifi-7265D-16.ucode } +append boot_modules { iwlwifi-8000C-16.ucode } +append boot_modules { report_rom } +append boot_modules { vfs_jitterentropy.lib.so } +append boot_modules { libcrypto.lib.so } +append boot_modules { libssl.lib.so } +append boot_modules { wpa_driver_nl80211.lib.so } +append boot_modules { wpa_supplicant.lib.so } +append boot_modules { wifi.lib.so } +append boot_modules { wifi_drv } +append boot_modules { core } +append boot_modules { nic_router } +append boot_modules { ld.lib.so } +append boot_modules { init } +append boot_modules { timer } +append boot_modules { test.iso } +append boot_modules { virtualbox_nic_router.vbox } +append boot_modules { ld.lib.so } +append boot_modules { libc.lib.so } +append boot_modules { libm.lib.so } +append boot_modules { pthread.lib.so } +append boot_modules { libc_pipe.lib.so } +append boot_modules { libc_terminal.lib.so } +append boot_modules { libiconv.lib.so } +append boot_modules { stdcxx.lib.so } +append boot_modules { qemu-usb.lib.so } +append boot_modules { dynamic_rom } +append boot_modules { ps2_drv } +append boot_modules { fb_drv } +append boot_modules { rtc_drv } +append boot_modules { usb_drv } +append boot_modules { vfs.lib.so } +append boot_modules { nic_drv } +append boot_modules { input_merger } +append boot_modules { log_terminal } append_platform_drv_boot_modules build_boot_image $boot_modules -if {[have_include "power_on/qemu"]} { - append qemu_args " -m 768 " - - append qemu_args " -cpu phenom " -} - run_genode_until forever