From fc273f3840d59fc76e290c9875bfba94baab3d17 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Tue, 3 Jan 2017 13:17:41 +0100 Subject: [PATCH] run: remove vanished kernel/platform specifier --- repos/base-okl4/run/priority.run | 2 +- repos/base/run/affinity.run | 14 ++++++-------- repos/base/run/mp_server.run | 12 ++++++------ repos/base/run/platform_drv.inc | 12 ++++++------ repos/base/run/sub_rm.run | 2 +- repos/dde_linux/run/lxip_http_srv.run | 2 +- repos/dde_linux/run/lxip_udp_echo.run | 2 +- repos/gems/run/cpu_load_display.run | 2 +- repos/gems/run/decorator_stress.run | 2 +- repos/gems/run/http_blk.run | 2 +- repos/gems/run/wm.run | 2 +- repos/libports/run/libc_block.run | 2 +- repos/libports/run/libc_ffat_fs.run | 2 +- repos/libports/run/libc_filesystem_test.inc | 2 +- repos/libports/run/lwip.run | 2 +- repos/libports/run/nic_router.run | 2 +- repos/libports/run/qt5_textedit.run | 2 +- repos/libports/run/test-ping_client.run | 2 +- repos/libports/run/test-ping_server.run | 2 +- repos/os/run/bomb.run | 6 ++++-- repos/os/run/cpu_quota.run | 6 +++--- repos/os/run/cpufreq.run | 3 ++- repos/os/run/demo.run | 2 +- repos/os/run/fb_bench.run | 2 +- repos/os/run/framebuffer.run | 2 +- repos/os/run/tz_vmm.run | 12 ++++++------ repos/os/run/vmm.run | 3 ++- repos/ports-foc/run/l4linux_netperf.inc | 3 +-- repos/ports/run/genode_org.run | 2 +- repos/ports/run/netperf.inc | 2 +- repos/ports/run/noux_net_netcat.run | 2 +- repos/ports/run/noux_tool_chain_auto.run | 14 +++++++------- repos/ports/run/noux_tool_chain_foc.run | 10 ++++------ repos/ports/run/noux_tool_chain_nova.run | 2 +- repos/ports/run/vbox_auto_win7_share.run | 4 ++-- repos/ports/run/vbox_win.inc | 4 ++-- repos/ports/run/virtualbox.run | 4 ++-- repos/ports/run/virtualbox_auto.inc | 2 +- 38 files changed, 77 insertions(+), 78 deletions(-) diff --git a/repos/base-okl4/run/priority.run b/repos/base-okl4/run/priority.run index c3fff75c5b..81b4794723 100644 --- a/repos/base-okl4/run/priority.run +++ b/repos/base-okl4/run/priority.run @@ -1,4 +1,4 @@ -assert_spec okl4_x86 +assert_spec okl4 build "core init" diff --git a/repos/base/run/affinity.run b/repos/base/run/affinity.run index f4de74fe46..71658f9b28 100644 --- a/repos/base/run/affinity.run +++ b/repos/base/run/affinity.run @@ -5,14 +5,12 @@ # if { - ![have_spec hw_arndale] && - ![have_spec hw_wand_quad] && - ![have_spec hw_panda] && - ![have_spec foc_x86_32] && - ![have_spec foc_x86_64] && - ![have_spec foc_panda] && - ![have_spec foc_arndale] && - ![have_spec foc_odroid_x2] && + ![have_spec arndale] && + ![have_spec wand_quad] && + ![have_spec panda] && + ![have_spec x86_32] && + ![have_spec x86_64] && + ![have_spec foc] && ![have_spec nova] } { puts "Platform is unsupported." diff --git a/repos/base/run/mp_server.run b/repos/base/run/mp_server.run index 9cafe4e081..6b021bfbfd 100644 --- a/repos/base/run/mp_server.run +++ b/repos/base/run/mp_server.run @@ -36,12 +36,12 @@ if {[have_include "power_on/qemu"]} { # pbxa9 - hw does not support multiple CPUs if {[have_spec pbxa9]} { set want_cpus 1 } # kernels only using one CPU even if more are configured - if {[have_spec okl4]} { set want_cpus 1 } - if {[have_spec pistachio]} { set want_cpus 1 } - if {[have_spec fiasco]} { set want_cpus 1 } - if {[have_spec hw_x86_64]} { set want_cpus 1 } - if {[have_spec hw_zynq]} { set want_cpus 1 } - if {[have_spec sel4]} { set want_cpus 1 } + if {[have_spec okl4]} { set want_cpus 1 } + if {[have_spec pistachio]} { set want_cpus 1 } + if {[have_spec fiasco]} { set want_cpus 1 } + if {([have_spec x86_64] && [have_spec hw])} { set want_cpus 1 } + if {[have_spec zynq]} { set want_cpus 1 } + if {[have_spec sel4]} { set want_cpus 1 } append qemu_args " -nographic -m 64 -smp $want_cpus,cores=$want_cpus " } diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc index 6c4512ccda..43c5213d67 100644 --- a/repos/base/run/platform_drv.inc +++ b/repos/base/run/platform_drv.inc @@ -22,11 +22,11 @@ proc append_platform_drv_build_components {} { proc append_platform_drv_boot_modules {} { global boot_modules - lappend_if [have_platform_drv] boot_modules platform_drv - lappend_if [have_spec acpi] boot_modules acpi_drv - lappend_if [have_spec acpi] boot_modules report_rom - lappend_if [have_spec nova] boot_modules device_pd - lappend_if [have_spec hw_x86_64_muen] boot_modules acpi + lappend_if [have_platform_drv] boot_modules platform_drv + lappend_if [have_spec acpi] boot_modules acpi_drv + lappend_if [have_spec acpi] boot_modules report_rom + lappend_if [have_spec nova] boot_modules device_pd + lappend_if [have_spec muen] boot_modules acpi } proc platform_drv_policy {} { @@ -61,7 +61,7 @@ proc platform_drv_add_routing {} { } proc platform_drv_config_config {} { - if {[have_spec acpi] || [have_spec arm] || [have_spec hw_x86_64_muen]} { + if {[have_spec acpi] || [have_spec arm] || [have_spec muen]} { return { } } diff --git a/repos/base/run/sub_rm.run b/repos/base/run/sub_rm.run index 720448b172..237f924154 100644 --- a/repos/base/run/sub_rm.run +++ b/repos/base/run/sub_rm.run @@ -27,7 +27,7 @@ append qemu_args "-nographic -m 64" run_genode_until {.*--- end of sub-rm test ---.*} 10 -if [have_spec linux_x86_32] { +if {([have_spec linux] && [have_spec x86_32])} { set maps [exec cat /proc/[exec pidof test-sub_rm]/maps] puts "\nmemory map after test completion follows:\n" diff --git a/repos/dde_linux/run/lxip_http_srv.run b/repos/dde_linux/run/lxip_http_srv.run index e1fbf5dc4e..771acaa239 100644 --- a/repos/dde_linux/run/lxip_http_srv.run +++ b/repos/dde_linux/run/lxip_http_srv.run @@ -1,5 +1,5 @@ set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] -set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec hw_odroid_xu] && ![have_spec linux] && ![have_spec hw_wand_quad]]] +set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec odroid_xu] && ![have_spec linux] && ![have_spec wand_quad]]] requires_installation_of lynx diff --git a/repos/dde_linux/run/lxip_udp_echo.run b/repos/dde_linux/run/lxip_udp_echo.run index 4994e8049d..d4044f57db 100644 --- a/repos/dde_linux/run/lxip_udp_echo.run +++ b/repos/dde_linux/run/lxip_udp_echo.run @@ -1,5 +1,5 @@ set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] -set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec hw_odroid_xu] && ![have_spec linux] && ![have_spec hw_wand_quad]]] +set use_nic_driver [expr [have_spec linux] || [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec odroid_xu] && ![have_spec linux] && ![have_spec wand_quad]]] # # Build diff --git a/repos/gems/run/cpu_load_display.run b/repos/gems/run/cpu_load_display.run index 8b53d106c4..7144ed5e72 100644 --- a/repos/gems/run/cpu_load_display.run +++ b/repos/gems/run/cpu_load_display.run @@ -2,7 +2,7 @@ # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script not supported on this platform."; exit 0 } set build_components { diff --git a/repos/gems/run/decorator_stress.run b/repos/gems/run/decorator_stress.run index 3ce358f5eb..9ebd20a833 100644 --- a/repos/gems/run/decorator_stress.run +++ b/repos/gems/run/decorator_stress.run @@ -2,7 +2,7 @@ # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/gems/run/http_blk.run b/repos/gems/run/http_blk.run index 592f69e870..a74bcf9952 100644 --- a/repos/gems/run/http_blk.run +++ b/repos/gems/run/http_blk.run @@ -4,7 +4,7 @@ # \date 2013-11-29 # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run index 526a651f2b..9d52cef0da 100644 --- a/repos/gems/run/wm.run +++ b/repos/gems/run/wm.run @@ -2,7 +2,7 @@ # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script not supported on this platform."; exit 0 } set build_components { diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index 9ef38d6e59..1ccae7cd1e 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -1,7 +1,7 @@ set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec pl180]] set use_ahci_drv [have_spec x86] -if {[expr [have_spec linux] || [have_spec hw_odroid_xu]]} { +if {[expr [have_spec linux] || [have_spec odroid_xu]]} { puts "Run script does not support this platform"; exit } if {![have_include power_on/qemu]} { diff --git a/repos/libports/run/libc_ffat_fs.run b/repos/libports/run/libc_ffat_fs.run index 415c05ff99..868fc8e2a6 100644 --- a/repos/libports/run/libc_ffat_fs.run +++ b/repos/libports/run/libc_ffat_fs.run @@ -8,7 +8,7 @@ set use_sd_card_drv [expr [have_spec omap4] || [have_spec arndale] || [have_spec set use_ahci_drv [have_spec x86] set mkfs [check_installed mkfs.vfat] -if {[expr [have_spec linux] || [have_spec hw_odroid_xu]]} { +if {[expr [have_spec linux] || [have_spec odroid_xu]]} { puts "Run script does not support this platform"; exit } # diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index 51a541fa02..c99d706e49 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -4,7 +4,7 @@ # \date 2011-05-27 # -if {[have_spec hw_odroid_xu] || [have_spec hw_zynq]} { +if {[have_spec odroid_xu] || [have_spec zynq]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index cab06d0ba7..19f47e7144 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -21,7 +21,7 @@ # set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] -set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec hw_odroid_xu] && ![have_spec linux] && ![have_spec hw_wand_quad]] +set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec odroid_xu] && ![have_spec linux] && ![have_spec wand_quad]] if {[expr !$use_usb_driver && !$use_nic_driver]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run index 39e153010b..a8d99af3c8 100644 --- a/repos/libports/run/nic_router.run +++ b/repos/libports/run/nic_router.run @@ -10,7 +10,7 @@ set udp_up_to_down_1 1 set udp_down_to_up_1 1 set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] -set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec hw_riscv] && ![have_spec hw_odroid_xu] && ![have_spec linux] && ![have_spec hw_wand_quad]] +set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec riscv] && ![have_spec odroid_xu] && ![have_spec linux] && ![have_spec wand_quad]] set nic_driver "nic_drv" if ($use_usb_driver) { diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index 9b0607382d..74ee9599b6 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -4,7 +4,7 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/libports/run/test-ping_client.run b/repos/libports/run/test-ping_client.run index 555187dbe3..a588d1d78b 100644 --- a/repos/libports/run/test-ping_client.run +++ b/repos/libports/run/test-ping_client.run @@ -8,7 +8,7 @@ # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/libports/run/test-ping_server.run b/repos/libports/run/test-ping_server.run index 50b10f117b..23ba70992a 100644 --- a/repos/libports/run/test-ping_server.run +++ b/repos/libports/run/test-ping_server.run @@ -8,7 +8,7 @@ # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/os/run/bomb.run b/repos/os/run/bomb.run index 005744e233..3b6cb993be 100644 --- a/repos/os/run/bomb.run +++ b/repos/os/run/bomb.run @@ -11,8 +11,10 @@ if {[have_include "power_on/qemu"]} { append qemu_args "-nographic -m 128" } else { # foc is really slow on native hardware executing this test - limit rounds - if {[have_spec foc_x86_32]} { set rounds 6 } - if {[have_spec foc_x86_64]} { set rounds 6 } + if {[have_spec foc]} { + if {[have_spec x86_32]} { set rounds 6 } + if {[have_spec x86_64]} { set rounds 6 } + } } # prevent hitting the socket-descriptor limit on Linux diff --git a/repos/os/run/cpu_quota.run b/repos/os/run/cpu_quota.run index f4fd27d37b..5b57cd5d17 100644 --- a/repos/os/run/cpu_quota.run +++ b/repos/os/run/cpu_quota.run @@ -152,7 +152,7 @@ proc check_counter { name opt cnt total_cnt } { # Zynq is currently tested merely in Qemu and most likely because of # that, the results are less precise. # - if {[have_spec zynq_qemu]} { set tol 0.03 } + if {[have_spec zynq]} { set tol 0.03 } # # FIXME: There is no reasonable explanation by now why the test results @@ -163,8 +163,8 @@ proc check_counter { name opt cnt total_cnt } { # * switching off SMP # * double-checking the speed of userland and kernel timers # - if {[have_spec hw_odroid_xu]} { set tol 0.04 } - if {[have_spec hw_arndale]} { set tol 0.04 } + if {[have_spec odroid_xu]} { set tol 0.04 } + if {[have_spec arndale]} { set tol 0.04 } if {[expr $total_cnt != 0]} { set is [expr double($cnt) / $total_cnt ] } diff --git a/repos/os/run/cpufreq.run b/repos/os/run/cpufreq.run index d2c4fc94ac..80020e611d 100644 --- a/repos/os/run/cpufreq.run +++ b/repos/os/run/cpufreq.run @@ -1,4 +1,5 @@ -assert_spec foc_arndale +assert_spec foc +assert_spec arndale # # Build diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index a02a5e005d..730a2d6c7d 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -2,7 +2,7 @@ # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run index 1d0a04973a..58c5fbb265 100644 --- a/repos/os/run/fb_bench.run +++ b/repos/os/run/fb_bench.run @@ -2,7 +2,7 @@ # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script not supported for this platform."; exit 0 } set build_components { core init test/fb_bench drivers/framebuffer drivers/timer } diff --git a/repos/os/run/framebuffer.run b/repos/os/run/framebuffer.run index 0883605906..0d92138541 100644 --- a/repos/os/run/framebuffer.run +++ b/repos/os/run/framebuffer.run @@ -2,7 +2,7 @@ # Build # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script not supported for this platform."; exit 0 } set build_components { core init test/framebuffer drivers/framebuffer drivers/timer } diff --git a/repos/os/run/tz_vmm.run b/repos/os/run/tz_vmm.run index 1b5df7b248..500b74ec03 100644 --- a/repos/os/run/tz_vmm.run +++ b/repos/os/run/tz_vmm.run @@ -17,7 +17,7 @@ # ! export TARGET_DEV=/dev/sdX # empty boot medium # ! export TARGET_MNT=/mnt # where to mount the boot medium # ! export GENODE_DIR=/path/genode # root of the Genode sources -# ! export BUILD_DIR=/path/build/hw_usb_armory # Genode build directory +# ! export BUILD_DIR=/path/build/usb_armory # Genode build directory # # :Format microSD card: # @@ -30,8 +30,8 @@ # :Install bootloader: # # ! cd $GENODE_DIR -# ! ./tool/create_uboot hw_usb_armory -# ! sudo dd if=contrib/uboot/build/hw_usb_armory/mmc_img of=$TARGET_DEV bs=1K seek=1 conv=fsync +# ! ./tool/create_uboot usb_armory +# ! sudo dd if=contrib/uboot/build/usb_armory/mmc_img of=$TARGET_DEV bs=1K seek=1 conv=fsync # # :Install Genode: # @@ -90,9 +90,9 @@ assert_spec imx53 assert_spec trustzone # determine platform specific configuration -set trusted_led [have_spec hw_usb_armory] -set inversepath_linux [have_spec hw_usb_armory] -set freescale_linux [have_spec hw_imx53_qsb_tz] +set trusted_led [have_spec usb_armory] +set inversepath_linux [have_spec usb_armory] +set freescale_linux [have_spec imx53_qsb] set initrd_rootfs $freescale_linux set mmc_rootfs $inversepath_linux set dtb $inversepath_linux diff --git a/repos/os/run/vmm.run b/repos/os/run/vmm.run index fccc81431b..4abed0a29a 100644 --- a/repos/os/run/vmm.run +++ b/repos/os/run/vmm.run @@ -4,7 +4,8 @@ # \date 2015-06-25 # -assert_spec hw_arndale +assert_spec hw +assert_spec arndale set build_components { core init diff --git a/repos/ports-foc/run/l4linux_netperf.inc b/repos/ports-foc/run/l4linux_netperf.inc index 27a9c7ad9f..6d229a85e7 100644 --- a/repos/ports-foc/run/l4linux_netperf.inc +++ b/repos/ports-foc/run/l4linux_netperf.inc @@ -6,8 +6,7 @@ assert_spec foc assert_spec 32bit - -assert_spec foc_arndale +assert_spec arndale set ip [check_installed ip] set wget [check_installed wget] diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index 9ea85cf5d0..252a631abd 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -9,7 +9,7 @@ # browser to http://localhost:5555 # -if {[have_spec hw_odroid_xu]} { +if {[have_spec odroid_xu]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 15b0154c4b..d73c5b12b1 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -12,7 +12,7 @@ if {[expr [have_include "power_on/qemu"] && !$force_qemu]} { exit } -if {[have_spec hw_odroid_xu] || [have_spec hw_wand_quad]} { +if {[have_spec odroid_xu] || [have_spec wand_quad]} { puts "Run script does not support this platform." exit 0 } diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index 6295676517..f54fe7638c 100644 --- a/repos/ports/run/noux_net_netcat.run +++ b/repos/ports/run/noux_net_netcat.run @@ -1,5 +1,5 @@ set use_usb_driver [expr [have_spec omap4] || [have_spec arndale] || [have_spec rpi]] -set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec linux] && ![have_spec hw_odroid_xu] && ![have_spec hw_wand_quad]] +set use_nic_driver [expr !$use_usb_driver && ![have_spec imx53] && ![have_spec linux] && ![have_spec odroid_xu] && ![have_spec wand_quad]] if {[expr !$use_usb_driver && !$use_nic_driver || [expr [have_include "power_on/qemu"] && [have_spec zynq]]]} { puts "\n Run script is not supported on this platform. \n"; exit 0 } diff --git a/repos/ports/run/noux_tool_chain_auto.run b/repos/ports/run/noux_tool_chain_auto.run index 498a808d5a..f8b6015278 100644 --- a/repos/ports/run/noux_tool_chain_auto.run +++ b/repos/ports/run/noux_tool_chain_auto.run @@ -8,6 +8,7 @@ if {[have_include "power_on/qemu"]} { puts "\nAuto test running on Qemu is not recommended.\n" exit 0 } + if {[have_spec pistachio] || [have_spec sel4]} { puts "Platform is unsupported." exit 0 @@ -18,24 +19,24 @@ set verbose_mode "no" set platform_pkgs "" set platform_cmds { - make core && + make core KERNEL=hw && exit 234 } +set platform_base_dir "base-hw" if {[have_spec arm]} { - set platform_base_dir "base-hw" set noux_boot_timeout 350 set tool_chain_timeout 600 if {[have_spec panda]} { - set platform "hw_panda" + set platform "panda" set tool_chain_timeout 1500 } if {[have_spec arndale]} { - set platform "hw_arndale" + set platform "arndale" set tool_chain_timeout 1500 } - if {[have_spec pbxa9]} { set platform "hw_pbxa9" } + if {[have_spec pbxa9]} { set platform "pbxa9" } if {![info exists platform]} { puts "\n Run script is not supported on this platform. \n" @@ -44,10 +45,9 @@ if {[have_spec arm]} { } if {[have_spec x86]} { - set platform_base_dir "base-hw" set noux_boot_timeout 100 set tool_chain_timeout 450 - set platform "hw_x86_64" + set platform "x86_64" if {[have_spec foc]} { set tool_chain_timeout 850 diff --git a/repos/ports/run/noux_tool_chain_foc.run b/repos/ports/run/noux_tool_chain_foc.run index a697039df0..194ee13b01 100644 --- a/repos/ports/run/noux_tool_chain_foc.run +++ b/repos/ports/run/noux_tool_chain_foc.run @@ -4,21 +4,19 @@ # \date 2012-11-26 # -if {![have_spec foc_x86_32]} { - puts "\nThis run script is currently only supported on the 'foc_x86_32' target platform\n" - exit 0 -} +assert_spec foc +assert_spec x86_32 # create a tar archive containing the l4 header files build core exec tar cfv bin/l4.tar -h --exclude=std_tmpl include l4 if {[have_spec x86_32]} { -set platform "foc_x86_32" +set platform "x86_32" } if {[have_spec x86_64]} { -set platform "foc_x86_64" +set platform "x86_64" } set platform_base_dir "base-foc" diff --git a/repos/ports/run/noux_tool_chain_nova.run b/repos/ports/run/noux_tool_chain_nova.run index 0d3bd990ab..4c51162724 100644 --- a/repos/ports/run/noux_tool_chain_nova.run +++ b/repos/ports/run/noux_tool_chain_nova.run @@ -4,7 +4,7 @@ # \date 2012-11-26 # -set platform "nova_x86_32" +set platform "x86_32" set platform_base_dir "base-nova" set platform_pkgs "" set platform_cmds "" diff --git a/repos/ports/run/vbox_auto_win7_share.run b/repos/ports/run/vbox_auto_win7_share.run index 7eb8d84144..22d3d14cae 100644 --- a/repos/ports/run/vbox_auto_win7_share.run +++ b/repos/ports/run/vbox_auto_win7_share.run @@ -62,8 +62,8 @@ if {[have_include "power_on/qemu"]} { exit 0 } -# Tested for nova and hw_x86_64_muen. -if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { +# Tested for nova and muen. +if {(![have_spec nova] && ![have_spec muen])} { puts "Platform is unsupported." exit 0 } diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index 1ca477b3ff..3bacad6536 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -1,5 +1,5 @@ -# Tested for nova and hw_x86_64_muen. -if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { +# Tested for nova and muen. +if {(![have_spec nova] && ![have_spec muen])} { puts "Platform is unsupported." exit 0 } diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 0863a61402..8caaed9cd0 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -65,10 +65,10 @@ append_if [expr $use_usb] config { } -append_if [expr $use_usb && ![have_spec hw_x86_64_muen]] config { +append_if [expr $use_usb && ![have_spec muen]] config { } -append_if [expr $use_usb && [have_spec hw_x86_64_muen]] config { +append_if [expr $use_usb && [have_spec muen]] config { } append_if [expr $use_usb] config { diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index b8e2006657..0d910e4905 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -1,4 +1,4 @@ -if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { +if {(![have_spec nova] && ![have_spec muen])} { puts "Platform is unsupported." exit 0 }