From ee564125df014063ca553fe364f53b9cd15dfcc7 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 20 Jun 2023 14:07:26 +0200 Subject: [PATCH] Replace ipxe_nic_drv by pc_nic_drv in run scripts Issue #4921 --- repos/dde_linux/run/nic_router_uplinks.run | 6 +++--- repos/libports/run/lwip.run | 3 --- repos/ports/run/vbox_share.inc | 4 ++-- repos/ports/run/vbox_win.inc | 6 +++--- repos/ports/run/virtualbox.run | 4 ++-- repos/ports/run/virtualbox6.run | 6 +++--- repos/ports/run/virtualbox_auto.inc | 2 +- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/repos/dde_linux/run/nic_router_uplinks.run b/repos/dde_linux/run/nic_router_uplinks.run index 5d16844760..fdb325b10e 100644 --- a/repos/dde_linux/run/nic_router_uplinks.run +++ b/repos/dde_linux/run/nic_router_uplinks.run @@ -25,7 +25,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/acpi_drv \ [depot_user]/src/dynamic_rom \ [depot_user]/src/init \ - [depot_user]/src/ipxe_nic_drv \ + [depot_user]/src/pc_nic_drv \ [depot_user]/src/nic_router \ [depot_user]/src/pci_decode \ [depot_user]/src/platform_drv \ @@ -85,7 +85,7 @@ install_config { - + @@ -102,7 +102,7 @@ install_config { - + diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 351445dd59..5309c1bb82 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -11,9 +11,6 @@ # host's port 5555. Consequently, it cannot be executed on non-qemu test # environments (i.e., the test won't work with the Linux version of Genode). # -# Please make sure to include a nic driver in your build configuration. E.g., -# on the x86 platform, you may enable the 'dde_ipxe' repository. -# # # TODO: Add support for Linux via user-level networking (using the diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc index 599fc55d0c..2d9367375c 100644 --- a/repos/ports/run/vbox_share.inc +++ b/repos/ports/run/vbox_share.inc @@ -118,7 +118,7 @@ set boot_modules { vfs fs_rom nic_router posix.lib.so bash.tar coreutils.tar tcp_terminal vfs_lwip.lib.so vfs_pipe.lib.so vfs_import.lib.so - ipxe_nic_drv report_rom event_filter + pc_nic_drv report_rom event_filter test.bin template.bat } @@ -127,7 +127,7 @@ append boot_modules $vbox_file set config_of_app { - + diff --git a/repos/ports/run/vbox_win.inc b/repos/ports/run/vbox_win.inc index 11e5a35424..52de7ecde1 100644 --- a/repos/ports/run/vbox_win.inc +++ b/repos/ports/run/vbox_win.inc @@ -38,7 +38,7 @@ if {![info exists webcam_vflip]} { set build_components { server/nic_router server/event_filter - drivers/nic + drivers/nic/pc drivers/audio server/report_rom server/dynamic_rom @@ -47,7 +47,7 @@ set build_components { set boot_modules { nic_router event_filter - ipxe_nic_drv + pc_nic_drv pci_audio_drv report_rom dynamic_rom @@ -84,7 +84,7 @@ set config_of_app { needs to be enabled in the .vbox file (disabled by default) --> - + diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 2c70d886a6..0ad3d5b678 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -98,7 +98,7 @@ append config { append_if [expr $use_net] config { - + @@ -298,7 +298,7 @@ append boot_modules { libyuv.lib.so } -append_if [expr $use_net] boot_modules { ipxe_nic_drv } +append_if [expr $use_net] boot_modules { pc_nic_drv } append_if [expr $use_net] boot_modules { nic_router } append_if [expr $use_serial] boot_modules { log_terminal } diff --git a/repos/ports/run/virtualbox6.run b/repos/ports/run/virtualbox6.run index 7f228bcbc5..a6cde4329a 100644 --- a/repos/ports/run/virtualbox6.run +++ b/repos/ports/run/virtualbox6.run @@ -28,7 +28,7 @@ lappend depot_archives [depot_user]/src/libdrm lappend depot_archives [depot_user]/src/libyuv lappend depot_archives [depot_user]/src/vfs_gpu -lappend_if [expr $use_net] depot_archives [depot_user]/src/ipxe_nic_drv +lappend_if [expr $use_net] depot_archives [depot_user]/src/pc_nic_drv lappend_if [expr $use_net] depot_archives [depot_user]/src/nic_router import_from_depot $depot_archives @@ -129,7 +129,7 @@ append_if [expr $use_net] config { - + @@ -295,7 +295,7 @@ set boot_modules { # platform-specific modules lappend_if [expr $use_top] boot_modules top -append_if [expr $use_net] boot_modules { ipxe_nic_drv } +append_if [expr $use_net] boot_modules { pc_nic_drv } append_if [expr $use_net] boot_modules { nic_router } append_if [expr $use_serial] boot_modules { log_terminal } append_if [expr $use_overlay] boot_modules { overlay.vdi } diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index cc4ef11d8e..8745b3c7a5 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -148,7 +148,7 @@ append config { - +