diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run index 5f6686e7e..23ed8a273 100644 --- a/repos/gems/run/depot_autopilot.run +++ b/repos/gems/run/depot_autopilot.run @@ -711,7 +711,6 @@ set default_test_pkgs { test-sequence test-signal test-slab - test-solo5 test-stack_smash test-stdcxx test-synced_interface @@ -764,7 +763,6 @@ set skip_test(test-rm_fault) [expr [have_spec linux] || ![non_executable_ set skip_test(test-rm_fault_no_nox) [expr [have_spec linux] || ![skip_test test-rm_fault]] set skip_test(test-rm_nested) [expr [have_spec linux]] set skip_test(test-slab) [expr ![interactive] && [have_include "power_on/qemu"]] -set skip_test(test-solo5) [expr ![have_spec x86_64]] set skip_test(test-spark_exception) [expr [have_spec arm]] set skip_test(test-tcp_bulk_lwip) [expr ![have_spec x86] && ![have_include "power_on/qemu"]] set skip_test(test-tcp_bulk_lxip) [expr ![have_spec x86] && ![have_include "power_on/qemu"]] diff --git a/repos/gems/run/mirage_pretty.run b/repos/gems/run/mirage_pretty.run deleted file mode 100644 index fd3af8d93..000000000 --- a/repos/gems/run/mirage_pretty.run +++ /dev/null @@ -1,140 +0,0 @@ -if {![have_spec x86_64]} { - puts "\nSolo5 requires a 64bit architecture\n" - exit 0 -} - -if {![file exists bin/mirage]} { - puts "" - puts "A mirage image must be provided at 'bin/mirage' to execute this scenario." - puts "" - exit 1 -} - -if {[have_spec linux]} { - puts "" - puts "This scenario is not available for Linux." - puts "" - exit 1 -} - -create_boot_directory - -import_from_depot \ - [depot_user]/src/[base_src] \ - [depot_user]/src/init \ - [depot_user]/src/ipxe_nic_drv \ - [depot_user]/src/rtc_drv \ - [depot_user]/pkg/terminal - -source ${genode_dir}/repos/base/run/platform_drv.inc - -set build_components { - app/log_core - drivers/framebuffer - drivers/input/dummy - lib/solo5 - server/terminal_log -} - -append_platform_drv_build_components - -build $build_components - -set fb_drv "vesa_fb_drv" - -if {[have_include "image/uefi"]} { - set fb_drv "fb_boot_drv" -} - -append config { - - - - - - - - - - - - - - - } - -append_platform_drv_config - -append config { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -} - -install_config $config - -append boot_modules { - dummy_input_drv - log_core - terminal_log - mirage - solo5.lib.so -} - -append boot_modules " $fb_drv" - -# platform-specific modules -append_platform_drv_boot_modules - -build_boot_image $boot_modules - -append qemu_args " -netdev user,id=net0 " -append qemu_args " -net nic,model=e1000,netdev=net0 " - -run_genode_until forever diff --git a/repos/libports/include/solo5/stdint.h b/repos/libports/include/solo5/stdint.h deleted file mode 100644 index 21f30459e..000000000 --- a/repos/libports/include/solo5/stdint.h +++ /dev/null @@ -1,12 +0,0 @@ -#include - -typedef genode_uint8_t uint8_t; -typedef genode_int8_t int8_t; -typedef genode_uint16_t uint16_t; -typedef genode_int16_t int16_t; -typedef genode_uint32_t uint32_t; -typedef genode_int32_t int32_t; -typedef genode_uint64_t uint64_t; -typedef genode_int64_t int64_t; -typedef unsigned long uintptr_t; -typedef unsigned long size_t; diff --git a/repos/libports/lib/import/import-solo5.mk b/repos/libports/lib/import/import-solo5.mk deleted file mode 100644 index 7c45aaf1c..000000000 --- a/repos/libports/lib/import/import-solo5.mk +++ /dev/null @@ -1,4 +0,0 @@ -REQUIRES += 64bit - -INC_DIR += $(call select_from_repositories,include/solo5) -INC_DIR += $(call select_from_ports,solo5)/include/solo5 diff --git a/repos/libports/lib/mk/solo5.mk b/repos/libports/lib/mk/solo5.mk deleted file mode 100644 index ac84bba33..000000000 --- a/repos/libports/lib/mk/solo5.mk +++ /dev/null @@ -1,23 +0,0 @@ -REQUIRES += 64bit - -SHARED_LIB = yes - -CC_OPT += -D__SOLO5_BINDINGS__ -Drestrict=__restrict__ - -# GCC 8 complains about a mismatch of the 'log()' function declaration. -# Since the solo5 'log()' function is unrelated to the builtin function, -# we disable the error message. -CC_OPT += -Wno-builtin-declaration-mismatch - -SRC_CC = bindings.cc - -SOLO5_PORT_DIR := $(call select_from_ports,solo5) - -INC_DIR += $(SOLO5_PORT_DIR)/src/lib/solo5/bindings -INC_DIR += $(SOLO5_PORT_DIR)/include/solo5 -INC_DIR += $(REP_DIR)/include/solo5 - -vpath bindings.cc $(SOLO5_PORT_DIR)/src/lib/solo5/bindings/genode - -# ignore warning about use of deprecated Xml_node API -CC_CXX_WARN_STRICT := diff --git a/repos/libports/lib/symbols/solo5 b/repos/libports/lib/symbols/solo5 deleted file mode 100644 index 61ca6cd7a..000000000 --- a/repos/libports/lib/symbols/solo5 +++ /dev/null @@ -1,13 +0,0 @@ -solo5_abort T -solo5_app_main U -solo5_block_info T -solo5_block_read T -solo5_block_write T -solo5_clock_monotonic T -solo5_clock_wall T -solo5_console_write T -solo5_exit T -solo5_net_info T -solo5_net_read T -solo5_net_write T -solo5_yield T diff --git a/repos/libports/ports/solo5.hash b/repos/libports/ports/solo5.hash deleted file mode 100644 index d1a8dd00b..000000000 --- a/repos/libports/ports/solo5.hash +++ /dev/null @@ -1 +0,0 @@ -55dd4fb026c0d4a7cc192c8228e4a6344f5781ef diff --git a/repos/libports/ports/solo5.port b/repos/libports/ports/solo5.port deleted file mode 100644 index f2320e787..000000000 --- a/repos/libports/ports/solo5.port +++ /dev/null @@ -1,11 +0,0 @@ -LICENSE := ISC -VERSION := HEAD -DOWNLOADS := solo5.archive - -REV := 7dca1a677f548ea0bc911a209f34ceb55d8f10fd -URL(solo5) := https://genode.org/files/solo5-$(REV).tar.gz -SHA(solo5) := 87a8e8e047bc6fffe0384f1cbb2bfde1e4c88c545287899be29444ec9a4d6b95 -DIR(solo5) := src/lib/solo5 - -DIRS := include/solo5 -DIR_CONTENT(include/solo5) = src/lib/solo5/include/solo5/solo5.h diff --git a/repos/libports/recipes/api/solo5/content.mk b/repos/libports/recipes/api/solo5/content.mk deleted file mode 100644 index e0161a925..000000000 --- a/repos/libports/recipes/api/solo5/content.mk +++ /dev/null @@ -1,16 +0,0 @@ -MIRROR_FROM_REP_DIR = lib/import/import-solo5.mk lib/symbols/solo5 - -content: $(MIRROR_FROM_REP_DIR) include/solo5 LICENSE - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/solo5)/src/lib/solo5 - -include/solo5: - mkdir -p $@ - cp -r $(PORT_DIR)/include/solo5/* $@ - cp -r $(REP_DIR)/include/solo5/* $@ - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -LICENSE: - cp $(PORT_DIR)/$@ $@ diff --git a/repos/libports/recipes/api/solo5/hash b/repos/libports/recipes/api/solo5/hash deleted file mode 100644 index c8f37cffb..000000000 --- a/repos/libports/recipes/api/solo5/hash +++ /dev/null @@ -1 +0,0 @@ -2019-05-05 8f54bd69a92ed4e090124d69a6a3b92689b39536 diff --git a/repos/libports/recipes/pkg/test-solo5/README b/repos/libports/recipes/pkg/test-solo5/README deleted file mode 100644 index e14cb9c5f..000000000 --- a/repos/libports/recipes/pkg/test-solo5/README +++ /dev/null @@ -1 +0,0 @@ -Test of the Solo5 unikernel middleware. diff --git a/repos/libports/recipes/pkg/test-solo5/archives b/repos/libports/recipes/pkg/test-solo5/archives deleted file mode 100644 index 8380a1d83..000000000 --- a/repos/libports/recipes/pkg/test-solo5/archives +++ /dev/null @@ -1,8 +0,0 @@ -_/src/init -_/src/nic_loopback -_/src/vfs_block -_/src/sequence -_/src/solo5 -_/src/test-solo5 -_/src/vfs -_/src/vfs_import diff --git a/repos/libports/recipes/pkg/test-solo5/hash b/repos/libports/recipes/pkg/test-solo5/hash deleted file mode 100644 index 48dcae304..000000000 --- a/repos/libports/recipes/pkg/test-solo5/hash +++ /dev/null @@ -1 +0,0 @@ -2020-06-18-b 32b32ac1918d2a2aebb7636e6faae4ea958b5eeb diff --git a/repos/libports/recipes/pkg/test-solo5/runtime b/repos/libports/recipes/pkg/test-solo5/runtime deleted file mode 100644 index 4d30b7102..000000000 --- a/repos/libports/recipes/pkg/test-solo5/runtime +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - [init] child "test" exited with exit value 0 - - Error: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/repos/libports/recipes/src/solo5/api b/repos/libports/recipes/src/solo5/api deleted file mode 100644 index 19e0c9e73..000000000 --- a/repos/libports/recipes/src/solo5/api +++ /dev/null @@ -1 +0,0 @@ -solo5 diff --git a/repos/libports/recipes/src/solo5/content.mk b/repos/libports/recipes/src/solo5/content.mk deleted file mode 100644 index f80fed7d3..000000000 --- a/repos/libports/recipes/src/solo5/content.mk +++ /dev/null @@ -1,20 +0,0 @@ -PORT_DIR_SOLO5 := $(call port_dir,$(REP_DIR)/ports/solo5) - -SRC_DIR = src/lib/solo5 - -MIRROR_FROM_REP_DIR = \ - include/solo5 \ - lib/import/import-solo5.mk \ - lib/mk/solo5.mk \ - -content: $(SRC_DIR) $(MIRROR_FROM_REP_DIR) - -$(SRC_DIR): - mkdir -p $@ - cp -r $(PORT_DIR_SOLO5)/$@/* $@/ - cp -r $(PORT_DIR_SOLO5)/include/solo5/* $@/bindings - cp $(PORT_DIR_SOLO5)/$@/LICENSE . - echo 'LIBS=solo5' > $@/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) diff --git a/repos/libports/recipes/src/solo5/hash b/repos/libports/recipes/src/solo5/hash deleted file mode 100644 index 0b421c168..000000000 --- a/repos/libports/recipes/src/solo5/hash +++ /dev/null @@ -1 +0,0 @@ -2020-05-26 b3a592352ce08a4c62cd8abb6718ddee44b0b184 diff --git a/repos/libports/recipes/src/solo5/used_apis b/repos/libports/recipes/src/solo5/used_apis deleted file mode 100644 index f26a4f019..000000000 --- a/repos/libports/recipes/src/solo5/used_apis +++ /dev/null @@ -1,7 +0,0 @@ -base -os -block_session -nic_session -rtc_session -timer_session -solo5 diff --git a/repos/libports/recipes/src/test-solo5/content.mk b/repos/libports/recipes/src/test-solo5/content.mk deleted file mode 100644 index f2772bfc1..000000000 --- a/repos/libports/recipes/src/test-solo5/content.mk +++ /dev/null @@ -1,19 +0,0 @@ -MIRROR_FROM_REP_DIR := src/test/solo5 - -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/solo5) - -content: $(MIRROR_FROM_REP_DIR) src/lib/solo5/tests src/lib/solo5/bindings LICENSE - -src/lib/solo5/bindings: $(PORT_DIR) - mkdir -p $@ - cp $(PORT_DIR)/$@/*.c $@ - -src/lib/solo5/tests: $(PORT_DIR) - mkdir -p $@ - cp -r $(PORT_DIR)/$@/test_* $@ - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -LICENSE: - cp $(PORT_DIR)/src/lib/solo5/LICENSE $@ diff --git a/repos/libports/recipes/src/test-solo5/hash b/repos/libports/recipes/src/test-solo5/hash deleted file mode 100644 index 0621a47ca..000000000 --- a/repos/libports/recipes/src/test-solo5/hash +++ /dev/null @@ -1 +0,0 @@ -2020-05-26 827f99e63057492c51a8f7c2cf86f23ba35d840e diff --git a/repos/libports/recipes/src/test-solo5/used_apis b/repos/libports/recipes/src/test-solo5/used_apis deleted file mode 100644 index e134d1f2b..000000000 --- a/repos/libports/recipes/src/test-solo5/used_apis +++ /dev/null @@ -1,2 +0,0 @@ -base -solo5 diff --git a/repos/libports/run/mirage_net.run b/repos/libports/run/mirage_net.run deleted file mode 100644 index f4c00ba3d..000000000 --- a/repos/libports/run/mirage_net.run +++ /dev/null @@ -1,105 +0,0 @@ -if {![have_spec x86_64]} { - puts "\nSolo5 requires a 64bit architecture\n" - exit 0 -} - -if {![file exists bin/mirage]} { - puts "" - puts "A mirage image must be provided at 'bin/mirage' to execute this scenario." - puts "" - exit 1 -} - -if {[have_spec linux]} { - puts "" - puts "This scenario is not available for the Linux platform." - puts "" - exit 1 -} - -create_boot_directory - -import_from_depot \ - [depot_user]/src/[base_src] \ - [depot_user]/src/init \ - [depot_user]/src/rtc_drv \ - -source ${genode_dir}/repos/base/run/platform_drv.inc - -set build_components { - drivers/nic - drivers/rtc - lib/solo5 -} - -append_platform_drv_build_components - -build $build_components - -append config { - - - - - - - - - - - - - - - } - -append_platform_drv_config - -append config { - - - - - - - - - - - - - - - - - - -} - -install_config $config - -set boot_modules { - mirage - rtc_drv - ipxe_nic_drv - solo5.lib.so -} - -# platform-specific modules -append_platform_drv_boot_modules - -build_boot_image $boot_modules - -append qemu_args " -nographic " - -proc qemu_nic_model {} { - if [have_spec x86] { return e1000 } - if [have_spec lan9118] { return lan9118 } - if [have_spec zynq] { return cadence_gem } - return nic_model_missing -} - -append qemu_args " -netdev user,id=net0 " -append qemu_args " -net nic,model=[qemu_nic_model],netdev=net0 " - -run_genode_until forever diff --git a/repos/libports/run/solo5.run b/repos/libports/run/solo5.run deleted file mode 100644 index 030b81719..000000000 --- a/repos/libports/run/solo5.run +++ /dev/null @@ -1,116 +0,0 @@ -if {![have_spec x86_64]} { - puts "\nTest requires x86_64\n" - exit 0 -} - -if {[have_spec linux]} { - puts "\nRun script is not supported on this platform\n" - exit 0 -} - -create_boot_directory - -import_from_depot \ - [depot_user]/src/[base_src] \ - [depot_user]/src/init \ - [depot_user]/src/nic_loopback \ - [depot_user]/src/vfs_block \ - [depot_user]/src/rtc_drv \ - [depot_user]/src/sequence \ - [depot_user]/src/vfs \ - [depot_user]/src/vfs_import - -append config { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - } - -if { ![get_cmd_switch --autopilot] || ![have_include "power_on/qemu"] } { - append config { - - - } -} - -append config { - - - -} - -install_config $config - -build { - test/solo5 -} - -build_boot_image { - solo5.lib.so - solo5-test_blk - solo5-test_fpu - solo5-test_globals - solo5-test_hello - solo5-test_quiet - solo5-test_time -} - -append qemu_args " -nographic " - -run_genode_until {child "test" exited with exit value 0} 40 diff --git a/repos/libports/run/solo5_ping.run b/repos/libports/run/solo5_ping.run deleted file mode 100644 index 1218371cd..000000000 --- a/repos/libports/run/solo5_ping.run +++ /dev/null @@ -1,122 +0,0 @@ -if {![have_spec x86_64]} { - puts "\nTest requires x86_64\n" - exit 0 -} - -if {[have_spec linux]} { - puts "\nRun script is not supported on this platform\n" - exit 0 -} - -create_boot_directory - -import_from_depot \ - [depot_user]/src/[base_src] \ - [depot_user]/src/init \ - [depot_user]/src/rtc_drv \ - -source ${genode_dir}/repos/base/run/platform_drv.inc - -append config { - - - - - - - - - - - - - - - - } - -append_platform_drv_config - -append config { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -} - -install_config $config - -append build_components { - app/ping - drivers/nic - server/nic_bridge - test/solo5/ping_serve -} - -append_platform_drv_build_components -build $build_components - -append boot_modules { - nic_bridge - ping - ipxe_nic_drv - solo5-test_ping_serve - solo5.lib.so -} - -append_platform_drv_boot_modules -build_boot_image $boot_modules - -append qemu_args " -nographic " - -run_genode_until {child "ping" exited with exit value 0} 60 diff --git a/repos/libports/run/solo5_ssp.run b/repos/libports/run/solo5_ssp.run deleted file mode 100644 index fdd82beb1..000000000 --- a/repos/libports/run/solo5_ssp.run +++ /dev/null @@ -1,51 +0,0 @@ -if {![have_spec x86_64]} { - puts "\nTest requires x86_64\n" - exit 0 -} - -create_boot_directory - -import_from_depot \ - [depot_user]/src/[base_src] \ - [depot_user]/src/init \ - -append config { - - - - - - - - - - - - - - - - - - - - - - - -} - -install_config $config - -build { - test/solo5 -} - -build_boot_image { - solo5.lib.so - solo5-test_ssp -} - -append qemu_args " -nographic " - -run_genode_until {Error: stack protector check failed} 20 diff --git a/repos/libports/src/lib/solo5/target.mk b/repos/libports/src/lib/solo5/target.mk deleted file mode 100644 index ee186f12a..000000000 --- a/repos/libports/src/lib/solo5/target.mk +++ /dev/null @@ -1,2 +0,0 @@ -TARGET = dummy-solo5 -LIBS = solo5 diff --git a/repos/libports/src/test/solo5/abort/target.mk b/repos/libports/src/test/solo5/abort/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/abort/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/blk/target.mk b/repos/libports/src/test/solo5/blk/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/blk/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/exception/target.mk b/repos/libports/src/test/solo5/exception/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/exception/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/fpu/target.mk b/repos/libports/src/test/solo5/fpu/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/fpu/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/globals/target.mk b/repos/libports/src/test/solo5/globals/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/globals/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/hello/target.mk b/repos/libports/src/test/solo5/hello/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/hello/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/ping_serve/target.mk b/repos/libports/src/test/solo5/ping_serve/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/ping_serve/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/quiet/target.mk b/repos/libports/src/test/solo5/quiet/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/quiet/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/ssp/target.mk b/repos/libports/src/test/solo5/ssp/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/ssp/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/repos/libports/src/test/solo5/test.inc b/repos/libports/src/test/solo5/test.inc deleted file mode 100644 index d7deb0e0d..000000000 --- a/repos/libports/src/test/solo5/test.inc +++ /dev/null @@ -1,10 +0,0 @@ -TEST_NAME := test_$(subst $(REP_DIR)/src/test/solo5/,,$(PRG_DIR)) -TARGET = solo5-$(TEST_NAME) - -LIBS += base solo5 - -CC_OPT += -fstack-protector-strong - -SRC_C += $(TEST_NAME).c - -vpath %.c $(call select_from_ports,solo5)/src/lib/solo5/tests/$(TEST_NAME) diff --git a/repos/libports/src/test/solo5/time/target.mk b/repos/libports/src/test/solo5/time/target.mk deleted file mode 100644 index c52248b9b..000000000 --- a/repos/libports/src/test/solo5/time/target.mk +++ /dev/null @@ -1 +0,0 @@ -include $(REP_DIR)/src/test/solo5/test.inc diff --git a/tool/autopilot.list b/tool/autopilot.list index ff808b238..2b92d1d7a 100644 --- a/tool/autopilot.list +++ b/tool/autopilot.list @@ -54,7 +54,6 @@ smartcard smbios_decoder smp sntp_client -solo5 sub_rm tar_rom thread