diff --git a/repos/ports/run/vbox_auto_win7_share.run b/repos/ports/run/vbox_auto_win7_share.run index 79e2ec218b..3ed9a2e488 100644 --- a/repos/ports/run/vbox_auto_win7_share.run +++ b/repos/ports/run/vbox_auto_win7_share.run @@ -62,8 +62,11 @@ if {[have_include "power_on/qemu"]} { exit 0 } -# Tested for nova. -assert_spec nova +# Tested for nova and hw_x86_64_muen. +if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { + puts "Platform is unsupported." + exit 0 +} set flavor "win7" set vdi_image "${flavor}.vdi" diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index b235b6bc03..e0d527ae46 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -1,6 +1,9 @@ -# Tested for nova. -assert_spec nova - +# Tested for nova and hw_x86_64_muen. +if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { + puts "Platform is unsupported." + exit 0 +} + if {[have_include "power_on/qemu"]} { puts "\nRun script does not support Qemu.\n" exit 0 diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 82efb64f73..896009ee99 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -37,7 +37,12 @@ set config { - + } + +append_if [have_spec muen] config { + } + +append config { @@ -58,8 +63,15 @@ append_if [expr $use_ps2] config { 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 hw_x86_64_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 aafa2b0d28..4007c6c400 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -1,4 +1,7 @@ -assert_spec nova +if {(![have_spec nova] && ![have_spec hw_x86_64_muen])} { + puts "Platform is unsupported." + exit 0 +} if {[have_include "power_on/qemu"]} { puts "\nRun script does not support Qemu.\n" @@ -6,7 +9,7 @@ if {[have_include "power_on/qemu"]} { } append build_components { - core init virtualbox + core init virtualbox server/part_blk server/rump_fs server/fs_rom @@ -42,7 +45,12 @@ set config { - + } + +append_if [have_spec muen] config { + } + +append config { @@ -116,8 +124,15 @@ 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 hw_x86_64_muen]] config { +} + +append_if [expr $use_usb] config {