diff --git a/repos/libports/run/acpi_suspend.run b/repos/libports/run/acpi_suspend.run index 2f04f2e122..ccdafc7348 100644 --- a/repos/libports/run/acpi_suspend.run +++ b/repos/libports/run/acpi_suspend.run @@ -89,9 +89,8 @@ proc gpu_config { } { } } - -set build_components { - core timer init +build { + core timer init lib/ld server/report_rom server/dynamic_rom server/rom_filter @@ -107,8 +106,6 @@ set build_components { test/suspend } -build $build_components - create_boot_directory set config "" @@ -330,16 +327,7 @@ install_config $config # non PCI devices for platform_drv, e.g. ps2/pit file copy [select_from_repositories board/[board]/devices] [run_dir]/genode/devices -set boot_modules { - core ld.lib.so init timer - report_rom dynamic_rom rom_filter - acpi_drv pc_platform_drv pci_decode - pc_intel_fb_drv test-framebuffer vesa_fb_drv intel_gpu_drv boot_fb_drv - acpica - test-suspend -} - -build_boot_image $boot_modules +build_boot_image [build_artifacts] # qemu machine model q35 and multiple CPUs don't work with NOVA kernel # diff --git a/repos/libports/run/extract.run b/repos/libports/run/extract.run index 3369bdc1c3..6db30811a9 100644 --- a/repos/libports/run/extract.run +++ b/repos/libports/run/extract.run @@ -42,13 +42,9 @@ install_config { exec tar cJf [run_dir]/genode/test.tar.xz -C [genode_dir] tool/depot exec xz < [genode_dir]/LICENSE > [run_dir]/genode/LICENSE.xz -build { app/extract } +build { app/extract lib/libc lib/vfs lib/libarchive lib/liblzma lib/zlib } -build_boot_image { - extract - libc.lib.so vfs.lib.so - libarchive.lib.so liblzma.lib.so zlib.lib.so -} +build_boot_image [build_artifacts] append qemu_args " -nographic " diff --git a/repos/libports/run/fatfs_blkio.run b/repos/libports/run/fatfs_blkio.run index ca60e3a377..642f0e7c50 100644 --- a/repos/libports/run/fatfs_blkio.run +++ b/repos/libports/run/fatfs_blkio.run @@ -1,9 +1,3 @@ -# -# \brief Test of FatFS block-io implementation -# \author Emery Hemingway -# \date 2017-07-31 -# - if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} { puts "Test only runs in Qemu or Linux.\n"; exit 0 @@ -16,7 +10,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/vfs_block \ [depot_user]/src/vfs_import -build { test/fatfs_block_io } +build { test/fatfs_block_io lib/libc lib/vfs } install_config { @@ -67,13 +61,7 @@ set cmd "dd if=/dev/zero of=$disk_image bs=512 count=4096" puts "creating disk image: $cmd" catch { exec sh -c $cmd } -build_boot_image { - libc.lib.so vfs.lib.so - libm.lib.so - vfs_import.lib.so - test-fatfs_block_io - test.hda -} +build_boot_image [list {*}[build_artifacts] test.hda] append qemu_args " -nographic " diff --git a/repos/libports/run/fetchurl.inc b/repos/libports/run/fetchurl.inc index c4c819f5c4..1c8cf59699 100644 --- a/repos/libports/run/fetchurl.inc +++ b/repos/libports/run/fetchurl.inc @@ -148,7 +148,7 @@ install_config { } #build { } -build_boot_image { } +build_boot_image [build_artifacts] append qemu_args " -nographic " append_qemu_nic_args diff --git a/repos/libports/run/fs_rom_update_fat.run b/repos/libports/run/fs_rom_update_fat.run index 9ae4876ff9..1a2ceb4e53 100644 --- a/repos/libports/run/fs_rom_update_fat.run +++ b/repos/libports/run/fs_rom_update_fat.run @@ -1,10 +1,8 @@ -# -# Build -# -set build_components { - core init timer +build { + core init timer lib/ld app/rom_logger app/rom_to_file + lib/vfs lib/vfs_fatfs lib/vfs_import server/dynamic_rom @@ -13,18 +11,13 @@ set build_components { server/vfs } -build $build_components - create_boot_directory set mkfs_cmd [installed_command mkfs.vfat] catch { exec $mkfs_cmd -C bin/fat.img -n "ROM_UPDATE" 64 } -# -# Generate config -# -append config { +install_config { @@ -121,31 +114,9 @@ append config { } -install_config $config +build_boot_image [list {*}[build_artifacts] fat.img] -# -# Boot modules -# - -# generic modules -set boot_modules { - core ld.lib.so init - dynamic_rom - fat.img - fs_rom - vfs_block - rom_logger - rom_to_file - timer - vfs - vfs.lib.so - vfs_fatfs.lib.so - vfs_import.lib.so -} - -build_boot_image $boot_modules - -append qemu_args " -nographic" +append qemu_args " -nographic " run_genode_until {.*.*} 60 diff --git a/repos/libports/run/ieee754.run b/repos/libports/run/ieee754.run index 75eb5ff5b2..4ccb0dad96 100644 --- a/repos/libports/run/ieee754.run +++ b/repos/libports/run/ieee754.run @@ -7,7 +7,7 @@ if {[have_board rpi]} { exit 0 } -build "core init test/ieee754" +build { core init lib/ld test/ieee754 lib/posix lib/libc lib/vfs } create_boot_directory install_config { @@ -58,7 +58,7 @@ install_config { } -build_boot_image "core ld.lib.so init test-ieee754 posix.lib.so libc.lib.so libm.lib.so vfs.lib.so" +build_boot_image [build_artifacts] append qemu_args "-nographic " diff --git a/repos/libports/run/libc.run b/repos/libports/run/libc.run index 193b6f4f2d..beac8e61c6 100644 --- a/repos/libports/run/libc.run +++ b/repos/libports/run/libc.run @@ -1,4 +1,4 @@ -build "core init timer test/libc" +build { core init timer lib/ld lib/libc lib/vfs lib/posix test/libc } create_boot_directory @@ -32,10 +32,7 @@ install_config { } -build_boot_image { - core init timer test-libc - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so -} +build_boot_image [build_artifacts] append qemu_args " -nographic " diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index 1e46c7a2b7..ebb3f19a77 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -6,9 +6,8 @@ if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} { create_boot_directory build { - core init timer + core init timer lib/ld lib/libc lib/posix lib/vfs_import server/vfs_block - lib/vfs_import test/libc_block } @@ -70,13 +69,7 @@ set cmd "dd if=/dev/zero of=$disk_image bs=1024 count=65536" puts "creating disk image: $cmd" catch { exec sh -c $cmd } -# generic modules -build_boot_image { - core init timer - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so - vfs_block vfs_import.lib.so - test-libc_block test.hda -} +build_boot_image [list {*}[build_artifacts] test.hda] append qemu_args " -nographic " diff --git a/repos/libports/run/libc_component.run b/repos/libports/run/libc_component.run index 3f6f950104..6f70208cb6 100644 --- a/repos/libports/run/libc_component.run +++ b/repos/libports/run/libc_component.run @@ -1,21 +1,11 @@ -# -# Build -# - -set build_components { - core init timer server/terminal_crosslink - test/libc_counter test/libc_component +build { + core init timer lib/ld lib/libc lib/vfs lib/posix + server/terminal_crosslink test/libc_counter test/libc_component } -build $build_components - create_boot_directory -# -# Generate config -# - -append config { +install_config { @@ -76,26 +66,9 @@ append config { } -install_config $config +build_boot_image [build_artifacts] -# -# Boot modules -# - - -set boot_modules { - core init timer terminal_crosslink - test-libc_counter-source test-libc_component - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so -} - -build_boot_image $boot_modules - -append qemu_args "-nographic " - -# -# Execute test case -# +append qemu_args " -nographic " run_genode_until forever run_genode_until "child \"test-libc_counter-sink\" exited with exit value 0.*\n" 30 diff --git a/repos/libports/run/libc_getaddrinfo.run b/repos/libports/run/libc_getaddrinfo.run index 01d67beeaa..1bca7575f9 100644 --- a/repos/libports/run/libc_getaddrinfo.run +++ b/repos/libports/run/libc_getaddrinfo.run @@ -107,7 +107,7 @@ install_config { } -build_boot_image { test-libc_getaddrinfo } +build_boot_image [build_artifacts] append qemu_args " -nographic " append_qemu_nic_args diff --git a/repos/libports/run/libc_getpwent.run b/repos/libports/run/libc_getpwent.run index d8e6d15cff..ac8f3bff4d 100644 --- a/repos/libports/run/libc_getpwent.run +++ b/repos/libports/run/libc_getpwent.run @@ -1,4 +1,7 @@ -build "core init app/sequence server/vfs test/libc_getpwent" +build { + core init lib/ld lib/libc lib/vfs lib/posix + app/sequence server/vfs test/libc_getpwent +} create_boot_directory @@ -66,12 +69,9 @@ install_config { } -build_boot_image { - core init vfs sequence test-libc_getpwent - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so -} +build_boot_image [build_artifacts] -append qemu_args " -nographic " +append qemu_args " -nographic " run_genode_until "child .* exited with exit value 0.*\n" 20 diff --git a/repos/libports/run/libc_integration.run b/repos/libports/run/libc_integration.run index 19cf3dccea..736410a16f 100644 --- a/repos/libports/run/libc_integration.run +++ b/repos/libports/run/libc_integration.run @@ -46,14 +46,6 @@ if { [get_cmd_switch --autopilot] } { create_boot_directory -set build_components { - test/libc_integration -} - -set boot_modules { - test-libc_integration -} - import_from_depot [depot_user]/src/[base_src] import_from_depot [depot_user]/src/init import_from_depot [depot_user]/src/libc @@ -63,10 +55,9 @@ import_from_depot [depot_user]/src/vfs import_from_depot [depot_user]/src/vfs_pipe \ [depot_user]/src/vfs_jitterentropy -build $build_components +build { test/libc_integration } -set config {} -append config { +install_config { @@ -111,9 +102,7 @@ append config { } -install_config $config - -build_boot_image $boot_modules +build_boot_image [build_artifacts] append qemu_args " -nographic -smp 10 " diff --git a/repos/libports/run/libc_select.run b/repos/libports/run/libc_select.run index d27bdd8794..80a1e09c32 100644 --- a/repos/libports/run/libc_select.run +++ b/repos/libports/run/libc_select.run @@ -1,14 +1,11 @@ -set build_components { - core init timer server/terminal_crosslink - test/libc_select test/libc_counter - lib/vfs_pipe +build { + core init timer lib/ld lib/libc lib/vfs lib/posix lib/stdcxx lib/vfs_pipe + server/terminal_crosslink test/libc_select test/libc_counter } -build $build_components - create_boot_directory -set config { +install_config { @@ -65,17 +62,13 @@ set config { } -install_config $config - -set boot_modules { +build_boot_image { core init timer terminal_crosslink test-libc_counter-source test-libc_select ld.lib.so libc.lib.so vfs.lib.so libm.lib.so stdcxx.lib.so vfs_pipe.lib.so posix.lib.so } -build_boot_image $boot_modules - append qemu_args " -nographic " run_genode_until "child \"test-libc_select\" exited with exit value 0.*\n" 120 diff --git a/repos/libports/run/libc_vfs_component.run b/repos/libports/run/libc_vfs_component.run index 0bc129a3c4..8d881568fd 100644 --- a/repos/libports/run/libc_vfs_component.run +++ b/repos/libports/run/libc_vfs_component.run @@ -1,21 +1,11 @@ -# -# Build -# - -set build_components { - core init timer server/terminal_crosslink server/vfs - test/libc_counter test/libc_component +build { + core init timer lib/ld lib/libc lib/vfs lib/posix + server/terminal_crosslink server/vfs test/libc_counter test/libc_component } -build $build_components - create_boot_directory -# -# Generate config -# - -append config { +install_config { @@ -87,27 +77,10 @@ append config { } -install_config $config - -# -# Boot modules -# - - -set boot_modules { - core init timer terminal_crosslink vfs - test-libc_counter-source test-libc_component - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so -} - -build_boot_image $boot_modules +build_boot_image [build_artifacts] append qemu_args "-nographic " -# -# Execute test case -# - run_genode_until forever run_genode_until "child \"test-libc_counter-sink\" exited with exit value 0.*\n" 30 diff --git a/repos/libports/run/libc_vfs_fat.run b/repos/libports/run/libc_vfs_fat.run index a5c17123ec..b05561c38f 100644 --- a/repos/libports/run/libc_vfs_fat.run +++ b/repos/libports/run/libc_vfs_fat.run @@ -3,7 +3,6 @@ set mkfs_opts "-F32 -nlibc_vfs" set test_build_components lib/vfs_fatfs set test_vfs_config "" -set test_boot_modules vfs_fatfs.lib.so set use_vfs_server 0 diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc index f6944a59dd..44e44c655c 100644 --- a/repos/libports/run/libc_vfs_filesystem_test.inc +++ b/repos/libports/run/libc_vfs_filesystem_test.inc @@ -11,7 +11,6 @@ # \arg use_vfs_server # \arg test_build_components # \arg test_vfs_config -# \arg test_boot_modules # if {[catch { exec which $mkfs_cmd } ]} { @@ -26,7 +25,7 @@ if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} { # Build # -set build_components { test/libc_vfs } +set build_components { test/libc_vfs lib/libc lib/vfs test/libc_vfs } lappend build_components {*}$test_build_components @@ -138,16 +137,7 @@ catch { exec sh -c $cmd } # Boot modules # -# generic modules -append boot_modules { - libc.lib.so vfs.lib.so test-libc_vfs test.hda -} - -lappend boot_modules {*}$test_boot_modules - -build_boot_image $boot_modules - -puts "#### boot_modules: $boot_modules" +build_boot_image [list {*}[build_artifacts] test.hda] # # Qemu diff --git a/repos/libports/run/libc_vfs_fs_fat.run b/repos/libports/run/libc_vfs_fs_fat.run index f1ac461c1a..aedd59744b 100644 --- a/repos/libports/run/libc_vfs_fs_fat.run +++ b/repos/libports/run/libc_vfs_fs_fat.run @@ -8,7 +8,6 @@ set mkfs_opts "-F32 -nlibc_vfs" set test_build_components lib/vfs_fatfs set test_vfs_config "" -set test_boot_modules vfs_fatfs.lib.so set use_vfs_server 1 diff --git a/repos/libports/run/libc_vfs_select.run b/repos/libports/run/libc_vfs_select.run index f7d6949688..a3176ea31a 100644 --- a/repos/libports/run/libc_vfs_select.run +++ b/repos/libports/run/libc_vfs_select.run @@ -1,14 +1,11 @@ -set build_components { - core init timer server/terminal_crosslink server/vfs - test/libc_select test/libc_counter - lib/vfs_pipe +build { + core init timer lib/ld lib/libc lib/posix lib/vfs lib/vfs_pipe lib/stdcxx + server/terminal_crosslink server/vfs test/libc_select test/libc_counter } -build $build_components - create_boot_directory -set config { +install_config { @@ -29,10 +26,12 @@ set config { + + @@ -54,6 +53,7 @@ set config { + @@ -74,16 +74,7 @@ set config { } -install_config $config - -set boot_modules { - core init timer terminal_crosslink vfs - test-libc_counter-source test-libc_select - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so stdcxx.lib.so - vfs_pipe.lib.so posix.lib.so -} - -build_boot_image $boot_modules +build_boot_image [build_artifacts] append qemu_args " -nographic " diff --git a/repos/libports/run/libc_vfs_tap.run b/repos/libports/run/libc_vfs_tap.run index acdf52707f..763042e195 100644 --- a/repos/libports/run/libc_vfs_tap.run +++ b/repos/libports/run/libc_vfs_tap.run @@ -1,26 +1,14 @@ -# -# Build -# -# - create_boot_directory import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/vfs_tap -set build_components { - core init timer - server/nic_router - test/libc_vfs_tap +build { + core init timer lib/libc lib/vfs lib/posix + server/nic_router test/libc_vfs_tap } -build $build_components - -# -# Generate config -# - -append config { +install_config { @@ -87,19 +75,7 @@ append config { } -install_config $config - -# -# Boot modules -# - - -set boot_modules { - core init timer test-libc_vfs_tap nic_router - libc.lib.so vfs.lib.so libm.lib.so posix.lib.so -} - -build_boot_image $boot_modules +build_boot_image [build_artifacts] append qemu_args "-nographic " diff --git a/repos/libports/run/libc_with_libc.run b/repos/libports/run/libc_with_libc.run index eb2ce9d91b..5bc7dfddc3 100644 --- a/repos/libports/run/libc_with_libc.run +++ b/repos/libports/run/libc_with_libc.run @@ -1,4 +1,4 @@ -build { core init timer test/libc_with_libc } +build { core init timer lib/ld lib/libc lib/vfs test/libc_with_libc } create_boot_directory @@ -32,11 +32,7 @@ install_config { } -build_boot_image { - core init timer - ld.lib.so libc.lib.so vfs.lib.so - test-libc_with_libc -} +build_boot_image [build_artifacts] append qemu_args " -nographic " diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index adc2eabd9b..3300f05b85 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -130,7 +130,7 @@ install_config { build { test/lwip/http_srv } -build_boot_image { test-lwip_httpsrv } +build_boot_image [build_artifacts] # # Qemu config diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run index 723518b9fa..0e79111634 100644 --- a/repos/libports/run/lwip_lx.run +++ b/repos/libports/run/lwip_lx.run @@ -22,26 +22,14 @@ assert_spec linux -# -# Build -# - build { - core init timer - drivers/nic - test/lwip/http_srv - lib/vfs_lwip - server/nic_router - server/report_rom + core init timer lib/ld lib/libc lib/vfs lib/vfs_lwip + drivers/nic test/lwip/http_srv server/nic_router server/report_rom } create_boot_directory -# -# Generate config -# - -set config { +install_config { @@ -127,23 +115,7 @@ set config { } -install_config $config - -# -# Boot modules -# - -set boot_modules { - core init timer linux_nic_drv - ld.lib.so libc.lib.so vfs.lib.so vfs_lwip.lib.so test-lwip_httpsrv - nic_router report_rom -} - -build_boot_image $boot_modules - -# -# Execute test case -# +build_boot_image [build_artifacts] run_genode_until forever diff --git a/repos/libports/run/memcpy.run b/repos/libports/run/memcpy.run index 47fcc26f18..51ea6594c3 100644 --- a/repos/libports/run/memcpy.run +++ b/repos/libports/run/memcpy.run @@ -5,7 +5,7 @@ if { [get_cmd_switch --autopilot] } { } } -build "core init test/memcpy" +build { core init lib/ld lib/libc lib/vfs test/memcpy } create_boot_directory @@ -35,10 +35,7 @@ install_config { } -build_boot_image { - core init test-memcpy - ld.lib.so libc.lib.so vfs.lib.so -} +build_boot_image [build_artifacts] append qemu_args " -nographic " diff --git a/repos/libports/run/mupdf.run b/repos/libports/run/mupdf.run index 0dd70e06b9..f6afdc976f 100644 --- a/repos/libports/run/mupdf.run +++ b/repos/libports/run/mupdf.run @@ -1,6 +1,10 @@ -build { app/pdf_view } +build { + lib/libc lib/vfs lib/openjpeg lib/freetype lib/libpng lib/zlib lib/jbig2dec + lib/mupdf lib/jpeg app/pdf_view +} create_boot_directory + import_from_depot \ [depot_user]/pkg/[drivers_interactive_pkg] \ [depot_user]/pkg/motif_wm \ @@ -25,10 +29,12 @@ install_config { + + @@ -50,7 +56,7 @@ install_config { - + @@ -111,13 +117,7 @@ set fd [open [run_dir]/genode/focus w] puts $fd " focus\"/>" close $fd -build_boot_image { - libc.lib.so vfs.lib.so libm.lib.so - openjpeg.lib.so freetype.lib.so libpng.lib.so zlib.lib.so jbig2dec.lib.so - mupdf.lib.so jpeg.lib.so - pdf_view - test.pdf -} +build_boot_image [list {*}[build_artifacts] test.pdf] append qemu_args " -m 800" diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index 3f3a6ea02b..aa06e337b8 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -166,10 +166,7 @@ install_config { } -build_boot_image { - test-http_clnt - test-lwip_httpsrv -} +build_boot_image [build_artifacts] append qemu_args " -nographic " append_qemu_nic_args diff --git a/repos/libports/run/oss.run b/repos/libports/run/oss.run index 66a85052fb..227d142619 100644 --- a/repos/libports/run/oss.run +++ b/repos/libports/run/oss.run @@ -1,23 +1,19 @@ assert_spec x86 if {[have_board linux]} { - puts "Run script does not support Linux." - exit 0 + puts "Run script does not support Linux." + exit 0 } if {[have_include "power_on/qemu"]} { - puts "Run script does not support Qemu" - exit 0 + puts "Run script does not support Qemu" + exit 0 } build { - core init timer - drivers/acpi - drivers/audio - drivers/platform - app/pci_decode - server/report_rom - lib/vfs_oss test/oss + core init timer lib/ld lib/libc lib/vfs lib/posix lib/vfs_oss + drivers/acpi drivers/audio drivers/platform app/pci_decode + server/report_rom test/oss } create_boot_directory @@ -121,11 +117,6 @@ install_config { } -build_boot_image { - core init timer test-oss - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so - posix.lib.so vfs_oss.lib.so - pci_audio_drv platform_drv pci_decode acpi_drv report_rom -} +build_boot_image [build_artifacts] run_genode_until forever diff --git a/repos/libports/run/pcg32.run b/repos/libports/run/pcg32.run index af0b685bad..34b94ab9ee 100644 --- a/repos/libports/run/pcg32.run +++ b/repos/libports/run/pcg32.run @@ -1,11 +1,4 @@ -# -# \brief Test of the PCG32 library -# \author Emery Hemingway -# \date 2017-08-23 -# - - -build "core init test/pcg32" +build { core init lib/ld lib/libc lib/vfs lib/posix test/pcg32 } create_boot_directory @@ -37,10 +30,7 @@ install_config { } -build_boot_image { - core init test-pcg32 - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so -} +build_boot_image [build_artifacts] append qemu_args " -nographic " diff --git a/repos/libports/run/sntp_client.run b/repos/libports/run/sntp_client.run index c4e25402e0..30c7b35342 100644 --- a/repos/libports/run/sntp_client.run +++ b/repos/libports/run/sntp_client.run @@ -20,7 +20,7 @@ import_from_depot [depot_user]/src/[base_src] \ build { app/sntp_client } -append config { +install_config { @@ -106,8 +106,7 @@ append config { } -install_config $config -build_boot_image { sntp_client } +build_boot_image [build_artifacts] append qemu_args " -nographic " append_qemu_nic_args diff --git a/repos/libports/run/system_rtc.run b/repos/libports/run/system_rtc.run index 15e1029987..b855313483 100644 --- a/repos/libports/run/system_rtc.run +++ b/repos/libports/run/system_rtc.run @@ -1,5 +1,3 @@ -# RTC test - assert_spec x86 if {[expr ![have_include power_on/qemu] && ![have_spec linux]]} { @@ -16,8 +14,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/posix \ [depot_user]/pkg/system_rtc-[board] - -set config { +install_config { @@ -86,11 +83,8 @@ set config { } -install_config $config +build { test/system_rtc test/libc_rtc } -set build_components { test/system_rtc test/libc_rtc } - -build $build_components build_boot_image [build_artifacts] append qemu_args " -nographic " diff --git a/repos/libports/run/vfs_lwip.inc b/repos/libports/run/vfs_lwip.inc deleted file mode 100644 index dfcd3b9acc..0000000000 --- a/repos/libports/run/vfs_lwip.inc +++ /dev/null @@ -1,11 +0,0 @@ -proc append_socket_fs_build_components { } { - global build_components - append build_components { lib/vfs_lwip } -} - -proc socket_fs_plugin {} { return lwip } - -proc append_socket_fs_boot_modules {} { - global boot_modules - append boot_modules { vfs_lwip.lib.so } -}