ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-06 19:20:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace ipxe_nic_drv by pc_nic_drv in run scripts

Browse Source 
Issue #4921
This commit is contained in:
Christian Helmuth 2023-06-20 14:07:26 +02:00 committed by Norman Feske
parent 8ecbc48211
commit ee564125df
7 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/dde_linux/run/nic_router_uplinks.run
View File

@ -25,7 +25,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/acpi_drv \ [depot_user]/src/acpi_drv \
[depot_user]/src/dynamic_rom \ [depot_user]/src/dynamic_rom \
[depot_user]/src/init \ [depot_user]/src/init \
[depot_user]/src/ipxe_nic_drv \ [depot_user]/src/pc_nic_drv \
[depot_user]/src/nic_router \ [depot_user]/src/nic_router \
[depot_user]/src/pci_decode \ [depot_user]/src/pci_decode \
[depot_user]/src/platform_drv \ [depot_user]/src/platform_drv \
@ -85,7 +85,7 @@ install_config {
</route> </route>
<config> <config>
<policy label_prefix="wifi_drv" info="yes"> <pci class="WIFI"/> </policy> <policy label_prefix="wifi_drv" info="yes"> <pci class="WIFI"/> </policy>
<policy label_prefix="nic_drv"> <pci class="ETHERNET"/> </policy> <policy label_prefix="nic_drv" info="yes"> <pci class="ETHERNET"/> </policy>
</config> </config>
</start> </start>
@ -102,7 +102,7 @@ install_config {
</start> </start>
<start name="nic_drv" priority="-1" caps="120"> <start name="nic_drv" priority="-1" caps="120">
<binary name="ipxe_nic_drv"/> <binary name="pc_nic_drv"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<route> <route>
<service name="Uplink"> <child name="router"/> </service> <service name="Uplink"> <child name="router"/> </service>

3
repos/libports/run/lwip.run
View File

@ -11,9 +11,6 @@
# host's port 5555. Consequently, it cannot be executed on non-qemu test # 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). # 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 # TODO: Add support for Linux via user-level networking (using the

4
repos/ports/run/vbox_share.inc
View File

@ -118,7 +118,7 @@ set boot_modules {
vfs fs_rom nic_router vfs fs_rom nic_router
posix.lib.so bash.tar coreutils.tar posix.lib.so bash.tar coreutils.tar
tcp_terminal vfs_lwip.lib.so vfs_pipe.lib.so vfs_import.lib.so 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 test.bin template.bat
} }
@ -127,7 +127,7 @@ append boot_modules $vbox_file
set config_of_app { set config_of_app {
<start name="nic_drv" priority="-1"> <start name="nic_drv" priority="-1">
<binary name="ipxe_nic_drv"/> <binary name="pc_nic_drv"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<route> <route>
<service name="Uplink"><child name="nic_router"/></service> <service name="Uplink"><child name="nic_router"/></service>

6
repos/ports/run/vbox_win.inc
View File

@ -38,7 +38,7 @@ if {![info exists webcam_vflip]} {
set build_components { set build_components {
server/nic_router server/nic_router
server/event_filter server/event_filter
drivers/nic drivers/nic/pc
drivers/audio drivers/audio
server/report_rom server/report_rom
server/dynamic_rom server/dynamic_rom
@ -47,7 +47,7 @@ set build_components {
set boot_modules { set boot_modules {
nic_router nic_router
event_filter event_filter
ipxe_nic_drv pc_nic_drv
pci_audio_drv pci_audio_drv
report_rom report_rom
dynamic_rom dynamic_rom
@ -84,7 +84,7 @@ set config_of_app {
needs to be enabled in the .vbox file (disabled by default) needs to be enabled in the .vbox file (disabled by default)
--> -->
<start name="nic_drv" priority="-1"> <start name="nic_drv" priority="-1">
<binary name="ipxe_nic_drv"/> <binary name="pc_nic_drv"/>
<resource name="RAM" quantum="8M" /> <resource name="RAM" quantum="8M" />
<route> <route>
<service name="Uplink"> <child name="nic_router"/> </service> <service name="Uplink"> <child name="nic_router"/> </service>

4
repos/ports/run/virtualbox.run
View File

@ -98,7 +98,7 @@ append config {
append_if [expr $use_net] config { append_if [expr $use_net] config {
<start name="nic_drv" priority="-1"> <start name="nic_drv" priority="-1">
<binary name="ipxe_nic_drv"/> <binary name="pc_nic_drv"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<route> <route>
<service name="Uplink"> <child name="nic_router"/> </service> <service name="Uplink"> <child name="nic_router"/> </service>
@ -298,7 +298,7 @@ append boot_modules {
libyuv.lib.so 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_net] boot_modules { nic_router }
append_if [expr $use_serial] boot_modules { log_terminal } append_if [expr $use_serial] boot_modules { log_terminal }

6
repos/ports/run/virtualbox6.run
View File

@ -28,7 +28,7 @@ lappend depot_archives [depot_user]/src/libdrm
lappend depot_archives [depot_user]/src/libyuv lappend depot_archives [depot_user]/src/libyuv
lappend depot_archives [depot_user]/src/vfs_gpu 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 lappend_if [expr $use_net] depot_archives [depot_user]/src/nic_router
import_from_depot $depot_archives import_from_depot $depot_archives
@ -129,7 +129,7 @@ append_if [expr $use_net] config {
</start> </start>
<start name="nic_drv" priority="-1"> <start name="nic_drv" priority="-1">
<binary name="ipxe_nic_drv"/> <binary name="pc_nic_drv"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<route> <route>
<service name="Platform"> <child name="drivers"/> </service> <service name="Platform"> <child name="drivers"/> </service>
@ -295,7 +295,7 @@ set boot_modules {
# platform-specific modules # platform-specific modules
lappend_if [expr $use_top] boot_modules top 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_net] boot_modules { nic_router }
append_if [expr $use_serial] boot_modules { log_terminal } append_if [expr $use_serial] boot_modules { log_terminal }
append_if [expr $use_overlay] boot_modules { overlay.vdi } append_if [expr $use_overlay] boot_modules { overlay.vdi }

2
repos/ports/run/virtualbox_auto.inc
View File

@ -148,7 +148,7 @@ append config {
<config> <config>
<policy label_prefix="ps2_drv"> <device name="ps2"/> </policy> <policy label_prefix="ps2_drv"> <device name="ps2"/> </policy>
<policy label_prefix="ahci_drv"> <pci class="AHCI"/> </policy> <policy label_prefix="ahci_drv"> <pci class="AHCI"/> </policy>
<policy label_prefix="nic_drv"> <pci class="ETHERNET"/> </policy> <policy label_prefix="nic_drv" info="yes"> <pci class="ETHERNET"/> </policy>
<policy label_prefix="audio_drv"> <policy label_prefix="audio_drv">
<pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>
<policy label_prefix="fb_drv" info="yes"> <pci class="VGA"/> </policy> <policy label_prefix="fb_drv" info="yes"> <pci class="VGA"/> </policy>