From e36ddaf659980d8dd618c7eff8f2874cf551a109 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 14 May 2018 13:58:13 +0200 Subject: [PATCH] Rename lwip library to lwip_legacy Rename LwIP library in preparation for removal of LwIP libc plugin. The current LwIP library will be replaced with a new version stripped of its synchronous socket support. The next version will be incompatible with the current, so removing 'lwip.lib.so' completely for a period makes it easy to identify legacy users. Fix #2797 --- repos/dde_linux/run/usb_net.run | 2 +- repos/dde_linux/run/usb_rndis.run | 2 +- repos/dde_linux/run/wifi.run | 2 +- repos/gems/run/http_blk.run | 2 +- repos/gems/run/tcp_terminal.run | 2 +- repos/gems/src/server/http_blk/http.cc | 2 +- .../include/{lwip => lwip_legacy}/arch/cc.h | 0 .../include/{lwip => lwip_legacy}/arch/perf.h | 0 .../{lwip => lwip_legacy}/arch/sys_arch.h | 0 .../include/{lwip => lwip_legacy}/genode.h | 0 .../include/{lwip => lwip_legacy}/lwipopts.h | 0 repos/libports/lib/import/import-lwip.mk | 2 -- .../libports/lib/import/import-lwip_legacy.mk | 2 ++ repos/libports/lib/mk/libc_lwip.mk | 2 +- repos/libports/lib/mk/libc_lwip_loopback.mk | 2 +- repos/libports/lib/mk/libc_lwip_nic_dhcp.mk | 2 +- .../lib/mk/{lwip.mk => lwip_legacy.mk} | 14 ++++++------- repos/libports/ports/lwip.hash | 1 - repos/libports/ports/lwip_legacy.hash | 1 + .../ports/{lwip.port => lwip_legacy.port} | 20 +++++++++---------- repos/libports/run/lwip.run | 2 +- repos/libports/run/lwip_lx.run | 2 +- repos/libports/run/nic_bridge.run | 2 +- repos/libports/run/nic_bridge_lighttpd.run | 2 +- repos/libports/run/nic_router.inc | 2 +- repos/libports/run/test-ping_client.run | 2 +- repos/libports/run/test-ping_server.run | 2 +- repos/libports/src/lib/libc_lwip/plugin.cc | 2 +- .../src/lib/libc_lwip_loopback/init.cc | 2 +- .../src/lib/libc_lwip_nic_dhcp/plugin.cc | 2 +- .../lib/{lwip => lwip_legacy}/api_msg.patch | 0 .../src/lib/{lwip => lwip_legacy}/errno.patch | 0 .../lib/{lwip => lwip_legacy}/include/nic.h | 0 .../include/ring_buffer.h | 0 .../{lwip => lwip_legacy}/include/thread.h | 0 .../{lwip => lwip_legacy}/include/verbose.h | 0 .../libc_select_notify.patch | 0 .../nonblocking_connect.patch | 0 .../lib/{lwip => lwip_legacy}/platform/nic.cc | 0 .../{lwip => lwip_legacy}/platform/printf.cc | 0 .../platform/sys_arch.cc | 2 +- .../remove_warnings.patch | 0 .../sockets_c_errno.patch | 0 .../sol_socket_definition.patch | 0 .../src/lib/{lwip => lwip_legacy}/symbol.map | 0 .../libports/src/test/lwip/http_clnt/main.cc | 2 +- .../src/test/lwip/http_clnt/target.mk | 2 +- repos/libports/src/test/lwip/http_srv/main.cc | 2 +- .../libports/src/test/lwip/http_srv/target.mk | 2 +- .../src/test/lwip/http_srv_static/main.cc | 2 +- .../src/test/lwip/http_srv_static/target.mk | 2 +- .../libports/src/test/lwip/loopback/target.mk | 2 +- .../lwip/pingpong/client/libc_lwip/target.mk | 2 +- .../test/lwip/pingpong/client/lwip/target.mk | 2 +- .../lwip/pingpong/server/libc_lwip/target.mk | 2 +- .../test/lwip/pingpong/server/lwip/target.mk | 2 +- .../src/test/lwip/pingpong/server/main.cc | 2 +- .../src/test/lwip/udp/client/target.mk | 2 +- .../src/test/lwip/udp/server/target.mk | 2 +- repos/ports/run/dosbox.run | 2 +- repos/ports/run/genode_org.run | 2 +- repos/ports/run/lighttpd.run | 2 +- repos/ports/run/netperf_lwip.inc | 2 +- repos/ports/run/noux_net_netcat.run | 2 +- repos/ports/run/vbox_share.inc | 2 +- repos/ports/src/app/dosbox/target.mk | 1 - repos/ports/src/noux/net/net.cc | 2 +- 67 files changed, 61 insertions(+), 62 deletions(-) rename repos/libports/include/{lwip => lwip_legacy}/arch/cc.h (100%) rename repos/libports/include/{lwip => lwip_legacy}/arch/perf.h (100%) rename repos/libports/include/{lwip => lwip_legacy}/arch/sys_arch.h (100%) rename repos/libports/include/{lwip => lwip_legacy}/genode.h (100%) rename repos/libports/include/{lwip => lwip_legacy}/lwipopts.h (100%) delete mode 100644 repos/libports/lib/import/import-lwip.mk create mode 100644 repos/libports/lib/import/import-lwip_legacy.mk rename repos/libports/lib/mk/{lwip.mk => lwip_legacy.mk} (72%) delete mode 100644 repos/libports/ports/lwip.hash create mode 100644 repos/libports/ports/lwip_legacy.hash rename repos/libports/ports/{lwip.port => lwip_legacy.port} (50%) rename repos/libports/src/lib/{lwip => lwip_legacy}/api_msg.patch (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/errno.patch (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/include/nic.h (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/include/ring_buffer.h (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/include/thread.h (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/include/verbose.h (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/libc_select_notify.patch (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/nonblocking_connect.patch (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/platform/nic.cc (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/platform/printf.cc (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/platform/sys_arch.cc (99%) rename repos/libports/src/lib/{lwip => lwip_legacy}/remove_warnings.patch (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/sockets_c_errno.patch (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/sol_socket_definition.patch (100%) rename repos/libports/src/lib/{lwip => lwip_legacy}/symbol.map (100%) diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index 1a873a0d45..4806e5f9f4 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -93,7 +93,7 @@ install_config $config # generic modules set boot_modules { core ld.lib.so init timer usb_drv - libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so posix.lib.so test-lwip_httpsrv + libc.lib.so vfs.lib.so libm.lib.so lwip_legacy.lib.so posix.lib.so test-lwip_httpsrv } append_platform_drv_boot_modules diff --git a/repos/dde_linux/run/usb_rndis.run b/repos/dde_linux/run/usb_rndis.run index 18b7226a33..55b78ff09a 100644 --- a/repos/dde_linux/run/usb_rndis.run +++ b/repos/dde_linux/run/usb_rndis.run @@ -100,7 +100,7 @@ install_config $config # generic modules set boot_modules { core ld.lib.so init timer usb_drv - libc.lib.so vfs.lib.so libc_pipe.lib.so lwip.lib.so pthread.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so lwip_legacy.lib.so pthread.lib.so tcp_terminal test-terminal_echo } diff --git a/repos/dde_linux/run/wifi.run b/repos/dde_linux/run/wifi.run index 693c820b7d..a84e6bfb4d 100644 --- a/repos/dde_linux/run/wifi.run +++ b/repos/dde_linux/run/wifi.run @@ -142,7 +142,7 @@ set boot_modules { wifi.lib.so wifi_drv - test-lwip_httpsrv lwip.lib.so + test-lwip_httpsrv lwip_legacy.lib.so } append boot_modules $firmware_modules diff --git a/repos/gems/run/http_blk.run b/repos/gems/run/http_blk.run index 6270f47296..4bc5324428 100644 --- a/repos/gems/run/http_blk.run +++ b/repos/gems/run/http_blk.run @@ -180,7 +180,7 @@ catch { exec dd if=/dev/zero of=bin/index.bin bs=512 count=400 } set boot_modules { core ld.lib.so init timer libc.lib.so vfs.lib.so libm.lib.so posix.lib.so - lwip.lib.so zlib.lib.so + lwip_legacy.lib.so zlib.lib.so lighttpd nic_bridge http_blk index.bin test-rom_blk } diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index c913d2b74f..a70c095f9f 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -86,7 +86,7 @@ install_config $config set boot_modules { core ld.lib.so init timer nic_drv - libc.lib.so vfs.lib.so pthread.lib.so lwip.lib.so libc_pipe.lib.so + libc.lib.so vfs.lib.so pthread.lib.so lwip_legacy.lib.so libc_pipe.lib.so tcp_terminal test-terminal_echo } diff --git a/repos/gems/src/server/http_blk/http.cc b/repos/gems/src/server/http_blk/http.cc index 33047a52ef..dc6c088f38 100644 --- a/repos/gems/src/server/http_blk/http.cc +++ b/repos/gems/src/server/http_blk/http.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/repos/libports/include/lwip/arch/cc.h b/repos/libports/include/lwip_legacy/arch/cc.h similarity index 100% rename from repos/libports/include/lwip/arch/cc.h rename to repos/libports/include/lwip_legacy/arch/cc.h diff --git a/repos/libports/include/lwip/arch/perf.h b/repos/libports/include/lwip_legacy/arch/perf.h similarity index 100% rename from repos/libports/include/lwip/arch/perf.h rename to repos/libports/include/lwip_legacy/arch/perf.h diff --git a/repos/libports/include/lwip/arch/sys_arch.h b/repos/libports/include/lwip_legacy/arch/sys_arch.h similarity index 100% rename from repos/libports/include/lwip/arch/sys_arch.h rename to repos/libports/include/lwip_legacy/arch/sys_arch.h diff --git a/repos/libports/include/lwip/genode.h b/repos/libports/include/lwip_legacy/genode.h similarity index 100% rename from repos/libports/include/lwip/genode.h rename to repos/libports/include/lwip_legacy/genode.h diff --git a/repos/libports/include/lwip/lwipopts.h b/repos/libports/include/lwip_legacy/lwipopts.h similarity index 100% rename from repos/libports/include/lwip/lwipopts.h rename to repos/libports/include/lwip_legacy/lwipopts.h diff --git a/repos/libports/lib/import/import-lwip.mk b/repos/libports/lib/import/import-lwip.mk deleted file mode 100644 index e212bb85d1..0000000000 --- a/repos/libports/lib/import/import-lwip.mk +++ /dev/null @@ -1,2 +0,0 @@ -INC_DIR += $(call select_from_ports,lwip)/include/lwip -INC_DIR += $(call select_from_repositories,include/lwip) diff --git a/repos/libports/lib/import/import-lwip_legacy.mk b/repos/libports/lib/import/import-lwip_legacy.mk new file mode 100644 index 0000000000..a7bea29415 --- /dev/null +++ b/repos/libports/lib/import/import-lwip_legacy.mk @@ -0,0 +1,2 @@ +INC_DIR += $(call select_from_ports,lwip_legacy)/include/lwip_legacy +INC_DIR += $(call select_from_repositories,include/lwip_legacy) diff --git a/repos/libports/lib/mk/libc_lwip.mk b/repos/libports/lib/mk/libc_lwip.mk index d6929e8c58..aaf4bec682 100644 --- a/repos/libports/lib/mk/libc_lwip.mk +++ b/repos/libports/lib/mk/libc_lwip.mk @@ -2,6 +2,6 @@ SRC_CC = init.cc plugin.cc vpath %.cc $(REP_DIR)/src/lib/libc_lwip -LIBS += lwip libc +LIBS += lwip_legacy libc CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/libc_lwip_loopback.mk b/repos/libports/lib/mk/libc_lwip_loopback.mk index a47ba759e6..67b67c3486 100644 --- a/repos/libports/lib/mk/libc_lwip_loopback.mk +++ b/repos/libports/lib/mk/libc_lwip_loopback.mk @@ -2,6 +2,6 @@ SRC_CC = init.cc vpath %.cc $(REP_DIR)/src/lib/libc_lwip_loopback -LIBS += lwip libc libc_lwip +LIBS += lwip_legacy libc libc_lwip CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/libc_lwip_nic_dhcp.mk b/repos/libports/lib/mk/libc_lwip_nic_dhcp.mk index a498ef070b..da88be1bb1 100644 --- a/repos/libports/lib/mk/libc_lwip_nic_dhcp.mk +++ b/repos/libports/lib/mk/libc_lwip_nic_dhcp.mk @@ -2,6 +2,6 @@ SRC_CC = plugin.cc vpath %.cc $(REP_DIR)/src/lib/libc_lwip_nic_dhcp -LIBS += lwip libc libc_lwip +LIBS += lwip_legacy libc libc_lwip CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/lwip.mk b/repos/libports/lib/mk/lwip_legacy.mk similarity index 72% rename from repos/libports/lib/mk/lwip.mk rename to repos/libports/lib/mk/lwip_legacy.mk index f4fd2d2971..16c4fb520c 100644 --- a/repos/libports/lib/mk/lwip.mk +++ b/repos/libports/lib/mk/lwip_legacy.mk @@ -4,8 +4,8 @@ # The library implementes TCP and UDP as well as DNS and DHCP. # -LWIP_PORT_DIR := $(call select_from_ports,lwip) -LWIP_DIR := $(LWIP_PORT_DIR)/src/lib/lwip +LWIP_PORT_DIR := $(call select_from_ports,lwip_legacy) +LWIP_DIR := $(LWIP_PORT_DIR)/src/lib/lwip_legacy # Genode platform files SRC_CC = nic.cc printf.cc sys_arch.cc @@ -30,17 +30,17 @@ D_OPTS = ERRNO D_OPTS := $(addprefix -D,$(D_OPTS)) CC_DEF += $(D_OPTS) -LD_OPT += --version-script=$(REP_DIR)/src/lib/lwip/symbol.map +LD_OPT += --version-script=$(REP_DIR)/src/lib/lwip_legacy/symbol.map -INC_DIR += $(REP_DIR)/include/lwip \ - $(LWIP_PORT_DIR)/include/lwip \ +INC_DIR += $(REP_DIR)/include/lwip_legacy \ + $(LWIP_PORT_DIR)/include/lwip_legacy \ $(LWIP_DIR)/src/include \ $(LWIP_DIR)/src/include/ipv4 \ $(LWIP_DIR)/src/include/api \ $(LWIP_DIR)/src/include/netif \ - $(REP_DIR)/src/lib/lwip/include + $(REP_DIR)/src/lib/lwip_legacy/include -vpath %.cc $(REP_DIR)/src/lib/lwip/platform +vpath %.cc $(REP_DIR)/src/lib/lwip_legacy/platform vpath %.c $(LWIP_DIR)/src/core vpath %.c $(LWIP_DIR)/src/core/ipv4 vpath %.c $(LWIP_DIR)/src/api diff --git a/repos/libports/ports/lwip.hash b/repos/libports/ports/lwip.hash deleted file mode 100644 index 4a8dce138c..0000000000 --- a/repos/libports/ports/lwip.hash +++ /dev/null @@ -1 +0,0 @@ -d84dafd43c71b0c325246801d7f2f5ee8ec7bbd9 diff --git a/repos/libports/ports/lwip_legacy.hash b/repos/libports/ports/lwip_legacy.hash new file mode 100644 index 0000000000..a3d68db2e1 --- /dev/null +++ b/repos/libports/ports/lwip_legacy.hash @@ -0,0 +1 @@ +7f5610426ed8c4c64903136122d9ba58836cdc89 diff --git a/repos/libports/ports/lwip.port b/repos/libports/ports/lwip_legacy.port similarity index 50% rename from repos/libports/ports/lwip.port rename to repos/libports/ports/lwip_legacy.port index dc6e6f0bea..065dd8f279 100644 --- a/repos/libports/ports/lwip.port +++ b/repos/libports/ports/lwip_legacy.port @@ -4,13 +4,13 @@ DOWNLOADS := lwip.git window_scaling_patch.file URL(lwip) := git://git.savannah.nongnu.org/lwip.git REV(lwip) := fe63f36656bd66b4051bdfab93e351a584337d7c -DIR(lwip) := src/lib/lwip +DIR(lwip) := src/lib/lwip_legacy URL(window_scaling_patch) := https://savannah.nongnu.org/patch/download.php?file_id=28026 -NAME(window_scaling_patch) := src/lib/lwip/window_scaling.patch -SHA(window_scaling_patch) := 5be562adddc05fa00ecead8fbca8d7797e76670e +NAME(window_scaling_patch) := src/lib/lwip_legacy/window_scaling.patch +SHA(window_scaling_patch) := b8dcaa2e0508208222e3e84a42cbe3eba6f6bfc728a5ba62d0d6c4c0c548e46f -PATCHES := $(addprefix src/lib/lwip/,window_scaling.patch \ +PATCHES := $(addprefix src/lib/lwip_legacy/,window_scaling.patch \ errno.patch \ libc_select_notify.patch \ sockets_c_errno.patch \ @@ -19,12 +19,12 @@ PATCHES := $(addprefix src/lib/lwip/,window_scaling.patch \ api_msg.patch \ nonblocking_connect.patch) -PATCH_OPT := -p1 -d src/lib/lwip +PATCH_OPT := -p1 -d src/lib/lwip_legacy -DIRS := include/lwip/lwip include/lwip/netif +DIRS := include/lwip_legacy/lwip include/lwip_legacy/netif -DIR_CONTENT(include/lwip/lwip) := src/lib/lwip/src/include/lwip/*.h \ - src/lib/lwip/src/include/ipv4/lwip/*.h \ - src/lib/lwip/src/include/ipv6/lwip/*.h +DIR_CONTENT(include/lwip_legacy/lwip) := src/lib/lwip_legacy/src/include/lwip/*.h \ + src/lib/lwip_legacy/src/include/ipv4/lwip/*.h \ + src/lib/lwip_legacy/src/include/ipv6/lwip/*.h -DIR_CONTENT(include/lwip/netif) := src/lib/lwip/src/include/netif/*.h +DIR_CONTENT(include/lwip_legacy/netif) := src/lib/lwip_legacy/src/include/netif/*.h diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 87dad78450..87f8d34b22 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -125,7 +125,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so test-lwip_httpsrv posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so lwip_legacy.lib.so test-lwip_httpsrv posix.lib.so } # platform-specific modules diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run index 74154e3cc4..57a4bae21e 100644 --- a/repos/libports/run/lwip_lx.run +++ b/repos/libports/run/lwip_lx.run @@ -58,7 +58,7 @@ install_config $config set boot_modules { core init timer linux_nic_drv - ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so lwip.lib.so test-lwip_httpsrv + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so lwip_legacy.lib.so test-lwip_httpsrv } build_boot_image $boot_modules diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index 63476d8da2..4e3ddedd2e 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -107,7 +107,7 @@ append boot_modules { ld.lib.so libc.lib.so vfs.lib.so libm.lib.so - lwip.lib.so + lwip_legacy.lib.so test-http_clnt test-lwip_httpsrv_static } diff --git a/repos/libports/run/nic_bridge_lighttpd.run b/repos/libports/run/nic_bridge_lighttpd.run index 56dff32a4f..6a422c0ffa 100644 --- a/repos/libports/run/nic_bridge_lighttpd.run +++ b/repos/libports/run/nic_bridge_lighttpd.run @@ -140,7 +140,7 @@ append boot_modules { ld.lib.so libc.lib.so vfs.lib.so posix.lib.so - lwip.lib.so + lwip_legacy.lib.so test-http_clnt libm.lib.so zlib.lib.so diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc index bd3f0ca324..0836204faa 100644 --- a/repos/libports/run/nic_router.inc +++ b/repos/libports/run/nic_router.inc @@ -61,7 +61,7 @@ proc server_config { name prot ip_addr gateway netmask nic port } { set boot_modules " core init timer nic_router nic_bridge nic_loopback ld.lib.so - libc.lib.so vfs.lib.so lwip.lib.so [client_bin udp] [server_bin udp] + libc.lib.so vfs.lib.so lwip_legacy.lib.so [client_bin udp] [server_bin udp] [client_bin http] [server_bin http] [platform_drv_boot_modules]" append qemu_args "-nographic " diff --git a/repos/libports/run/test-ping_client.run b/repos/libports/run/test-ping_client.run index 5a5c02e9ee..e159c01cfe 100644 --- a/repos/libports/run/test-ping_client.run +++ b/repos/libports/run/test-ping_client.run @@ -130,7 +130,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so vfs.lib.so lwip.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so lwip_legacy.lib.so posix.lib.so test-ping_client_libc_lwip } diff --git a/repos/libports/run/test-ping_server.run b/repos/libports/run/test-ping_server.run index 055aca1384..fe3eb66f50 100644 --- a/repos/libports/run/test-ping_server.run +++ b/repos/libports/run/test-ping_server.run @@ -104,7 +104,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so vfs.lib.so lwip.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so lwip_legacy.lib.so posix.lib.so test-ping_server_libc_lwip } diff --git a/repos/libports/src/lib/libc_lwip/plugin.cc b/repos/libports/src/lib/libc_lwip/plugin.cc index 5046982bed..32cf4d7b01 100644 --- a/repos/libports/src/lib/libc_lwip/plugin.cc +++ b/repos/libports/src/lib/libc_lwip/plugin.cc @@ -29,7 +29,7 @@ extern "C" { #include } -#include +#include #include /* lwip and libc have different definitions for the FD_* macros and renaming diff --git a/repos/libports/src/lib/libc_lwip_loopback/init.cc b/repos/libports/src/lib/libc_lwip_loopback/init.cc index 69fbb799f7..1271db0dff 100644 --- a/repos/libports/src/lib/libc_lwip_loopback/init.cc +++ b/repos/libports/src/lib/libc_lwip_loopback/init.cc @@ -14,7 +14,7 @@ #include -#include +#include extern void create_lwip_plugin(); diff --git a/repos/libports/src/lib/libc_lwip_nic_dhcp/plugin.cc b/repos/libports/src/lib/libc_lwip_nic_dhcp/plugin.cc index d00feefb79..ca6c3e9127 100644 --- a/repos/libports/src/lib/libc_lwip_nic_dhcp/plugin.cc +++ b/repos/libports/src/lib/libc_lwip_nic_dhcp/plugin.cc @@ -44,7 +44,7 @@ #include #include -#include +#include #undef AF_INET6 #undef MSG_PEEK diff --git a/repos/libports/src/lib/lwip/api_msg.patch b/repos/libports/src/lib/lwip_legacy/api_msg.patch similarity index 100% rename from repos/libports/src/lib/lwip/api_msg.patch rename to repos/libports/src/lib/lwip_legacy/api_msg.patch diff --git a/repos/libports/src/lib/lwip/errno.patch b/repos/libports/src/lib/lwip_legacy/errno.patch similarity index 100% rename from repos/libports/src/lib/lwip/errno.patch rename to repos/libports/src/lib/lwip_legacy/errno.patch diff --git a/repos/libports/src/lib/lwip/include/nic.h b/repos/libports/src/lib/lwip_legacy/include/nic.h similarity index 100% rename from repos/libports/src/lib/lwip/include/nic.h rename to repos/libports/src/lib/lwip_legacy/include/nic.h diff --git a/repos/libports/src/lib/lwip/include/ring_buffer.h b/repos/libports/src/lib/lwip_legacy/include/ring_buffer.h similarity index 100% rename from repos/libports/src/lib/lwip/include/ring_buffer.h rename to repos/libports/src/lib/lwip_legacy/include/ring_buffer.h diff --git a/repos/libports/src/lib/lwip/include/thread.h b/repos/libports/src/lib/lwip_legacy/include/thread.h similarity index 100% rename from repos/libports/src/lib/lwip/include/thread.h rename to repos/libports/src/lib/lwip_legacy/include/thread.h diff --git a/repos/libports/src/lib/lwip/include/verbose.h b/repos/libports/src/lib/lwip_legacy/include/verbose.h similarity index 100% rename from repos/libports/src/lib/lwip/include/verbose.h rename to repos/libports/src/lib/lwip_legacy/include/verbose.h diff --git a/repos/libports/src/lib/lwip/libc_select_notify.patch b/repos/libports/src/lib/lwip_legacy/libc_select_notify.patch similarity index 100% rename from repos/libports/src/lib/lwip/libc_select_notify.patch rename to repos/libports/src/lib/lwip_legacy/libc_select_notify.patch diff --git a/repos/libports/src/lib/lwip/nonblocking_connect.patch b/repos/libports/src/lib/lwip_legacy/nonblocking_connect.patch similarity index 100% rename from repos/libports/src/lib/lwip/nonblocking_connect.patch rename to repos/libports/src/lib/lwip_legacy/nonblocking_connect.patch diff --git a/repos/libports/src/lib/lwip/platform/nic.cc b/repos/libports/src/lib/lwip_legacy/platform/nic.cc similarity index 100% rename from repos/libports/src/lib/lwip/platform/nic.cc rename to repos/libports/src/lib/lwip_legacy/platform/nic.cc diff --git a/repos/libports/src/lib/lwip/platform/printf.cc b/repos/libports/src/lib/lwip_legacy/platform/printf.cc similarity index 100% rename from repos/libports/src/lib/lwip/platform/printf.cc rename to repos/libports/src/lib/lwip_legacy/platform/printf.cc diff --git a/repos/libports/src/lib/lwip/platform/sys_arch.cc b/repos/libports/src/lib/lwip_legacy/platform/sys_arch.cc similarity index 99% rename from repos/libports/src/lib/lwip/platform/sys_arch.cc rename to repos/libports/src/lib/lwip_legacy/platform/sys_arch.cc index 0ab6329d3e..7499b694d2 100644 --- a/repos/libports/src/lib/lwip/platform/sys_arch.cc +++ b/repos/libports/src/lib/lwip_legacy/platform/sys_arch.cc @@ -20,7 +20,7 @@ #include /* LwIP includes */ -#include +#include #include #include #include diff --git a/repos/libports/src/lib/lwip/remove_warnings.patch b/repos/libports/src/lib/lwip_legacy/remove_warnings.patch similarity index 100% rename from repos/libports/src/lib/lwip/remove_warnings.patch rename to repos/libports/src/lib/lwip_legacy/remove_warnings.patch diff --git a/repos/libports/src/lib/lwip/sockets_c_errno.patch b/repos/libports/src/lib/lwip_legacy/sockets_c_errno.patch similarity index 100% rename from repos/libports/src/lib/lwip/sockets_c_errno.patch rename to repos/libports/src/lib/lwip_legacy/sockets_c_errno.patch diff --git a/repos/libports/src/lib/lwip/sol_socket_definition.patch b/repos/libports/src/lib/lwip_legacy/sol_socket_definition.patch similarity index 100% rename from repos/libports/src/lib/lwip/sol_socket_definition.patch rename to repos/libports/src/lib/lwip_legacy/sol_socket_definition.patch diff --git a/repos/libports/src/lib/lwip/symbol.map b/repos/libports/src/lib/lwip_legacy/symbol.map similarity index 100% rename from repos/libports/src/lib/lwip/symbol.map rename to repos/libports/src/lib/lwip_legacy/symbol.map diff --git a/repos/libports/src/test/lwip/http_clnt/main.cc b/repos/libports/src/test/lwip/http_clnt/main.cc index d43d623e88..c8bbcd390c 100644 --- a/repos/libports/src/test/lwip/http_clnt/main.cc +++ b/repos/libports/src/test/lwip/http_clnt/main.cc @@ -26,7 +26,7 @@ extern "C" { #include } -#include +#include /** diff --git a/repos/libports/src/test/lwip/http_clnt/target.mk b/repos/libports/src/test/lwip/http_clnt/target.mk index b9bb2e6ba4..7486025f5a 100644 --- a/repos/libports/src/test/lwip/http_clnt/target.mk +++ b/repos/libports/src/test/lwip/http_clnt/target.mk @@ -1,5 +1,5 @@ TARGET = test-http_clnt -LIBS = lwip libc +LIBS = lwip_legacy libc SRC_CC = main.cc INC_DIR += $(REP_DIR)/src/lib/lwip/include diff --git a/repos/libports/src/test/lwip/http_srv/main.cc b/repos/libports/src/test/lwip/http_srv/main.cc index 61e0e3a32a..bb35e74f8d 100644 --- a/repos/libports/src/test/lwip/http_srv/main.cc +++ b/repos/libports/src/test/lwip/http_srv/main.cc @@ -29,7 +29,7 @@ extern "C" { #include } -#include +#include const static char http_html_hdr[] = diff --git a/repos/libports/src/test/lwip/http_srv/target.mk b/repos/libports/src/test/lwip/http_srv/target.mk index e8bc24534a..216b993d5b 100644 --- a/repos/libports/src/test/lwip/http_srv/target.mk +++ b/repos/libports/src/test/lwip/http_srv/target.mk @@ -1,5 +1,5 @@ TARGET = test-lwip_httpsrv -LIBS = lwip posix +LIBS = lwip_legacy posix SRC_CC = main.cc INC_DIR += $(REP_DIR)/src/lib/lwip/include diff --git a/repos/libports/src/test/lwip/http_srv_static/main.cc b/repos/libports/src/test/lwip/http_srv_static/main.cc index 1c79edfa4d..b1e1baffef 100644 --- a/repos/libports/src/test/lwip/http_srv_static/main.cc +++ b/repos/libports/src/test/lwip/http_srv_static/main.cc @@ -30,7 +30,7 @@ extern "C" { #include } -#include +#include using Response = Genode::String<1024>; diff --git a/repos/libports/src/test/lwip/http_srv_static/target.mk b/repos/libports/src/test/lwip/http_srv_static/target.mk index 201782ee3e..bceaa7d105 100644 --- a/repos/libports/src/test/lwip/http_srv_static/target.mk +++ b/repos/libports/src/test/lwip/http_srv_static/target.mk @@ -1,5 +1,5 @@ TARGET = test-lwip_httpsrv_static -LIBS = lwip libc +LIBS = lwip_legacy libc SRC_CC = main.cc INC_DIR += $(REP_DIR)/src/lib/lwip/include diff --git a/repos/libports/src/test/lwip/loopback/target.mk b/repos/libports/src/test/lwip/loopback/target.mk index 4cca863cd1..fb828c939f 100644 --- a/repos/libports/src/test/lwip/loopback/target.mk +++ b/repos/libports/src/test/lwip/loopback/target.mk @@ -1,5 +1,5 @@ TARGET = test-lwip_loop -LIBS = lwip posix libc_lwip_loopback +LIBS = lwip_legacy posix libc_lwip_loopback SRC_CC = main.cc CC_CXX_WARN_STRICT = diff --git a/repos/libports/src/test/lwip/pingpong/client/libc_lwip/target.mk b/repos/libports/src/test/lwip/pingpong/client/libc_lwip/target.mk index fe672b1174..0c739455f8 100644 --- a/repos/libports/src/test/lwip/pingpong/client/libc_lwip/target.mk +++ b/repos/libports/src/test/lwip/pingpong/client/libc_lwip/target.mk @@ -1,5 +1,5 @@ TARGET = test-ping_client_libc_lwip -LIBS = posix lwip libc_lwip_nic_dhcp +LIBS = posix lwip_legacy libc_lwip_nic_dhcp SRC_CC = main.cc pingpong.cc vpath main.cc $(PRG_DIR)/.. diff --git a/repos/libports/src/test/lwip/pingpong/client/lwip/target.mk b/repos/libports/src/test/lwip/pingpong/client/lwip/target.mk index 28cf12ad88..a39a01bd44 100644 --- a/repos/libports/src/test/lwip/pingpong/client/lwip/target.mk +++ b/repos/libports/src/test/lwip/pingpong/client/lwip/target.mk @@ -1,5 +1,5 @@ TARGET = test-ping_client_lwip -LIBS = posix lwip +LIBS = posix lwip_legacy SRC_CC = main.cc pingpong.cc INC_DIR += $(REP_DIR)/src/lib/lwip/include diff --git a/repos/libports/src/test/lwip/pingpong/server/libc_lwip/target.mk b/repos/libports/src/test/lwip/pingpong/server/libc_lwip/target.mk index 3e4a6b8b4a..147ba75818 100644 --- a/repos/libports/src/test/lwip/pingpong/server/libc_lwip/target.mk +++ b/repos/libports/src/test/lwip/pingpong/server/libc_lwip/target.mk @@ -1,5 +1,5 @@ TARGET = test-ping_server_libc_lwip -LIBS = posix libc_lwip_nic_dhcp libc_lwip lwip +LIBS = posix libc_lwip_nic_dhcp libc_lwip lwip_legacy SRC_CC = main.cc pingpong.cc vpath main.cc $(PRG_DIR)/.. diff --git a/repos/libports/src/test/lwip/pingpong/server/lwip/target.mk b/repos/libports/src/test/lwip/pingpong/server/lwip/target.mk index a9c9dcf9fb..f976659a96 100644 --- a/repos/libports/src/test/lwip/pingpong/server/lwip/target.mk +++ b/repos/libports/src/test/lwip/pingpong/server/lwip/target.mk @@ -1,5 +1,5 @@ TARGET = test-ping_server_lwip -LIBS = posix lwip +LIBS = posix lwip_legacy SRC_CC = main.cc pingpong.cc CC_OPT += -DLWIP_NATIVE diff --git a/repos/libports/src/test/lwip/pingpong/server/main.cc b/repos/libports/src/test/lwip/pingpong/server/main.cc index 8753fb652c..dcbf05ed95 100644 --- a/repos/libports/src/test/lwip/pingpong/server/main.cc +++ b/repos/libports/src/test/lwip/pingpong/server/main.cc @@ -17,7 +17,7 @@ #ifdef LWIP_NATIVE #include -#include +#include #endif #include "../pingpong.h" diff --git a/repos/libports/src/test/lwip/udp/client/target.mk b/repos/libports/src/test/lwip/udp/client/target.mk index 24afadc5d7..ef7363a79f 100644 --- a/repos/libports/src/test/lwip/udp/client/target.mk +++ b/repos/libports/src/test/lwip/udp/client/target.mk @@ -1,5 +1,5 @@ TARGET = test-lwip-udp-client -LIBS = libc libc_lwip_nic_dhcp libc_lwip lwip +LIBS = libc libc_lwip_nic_dhcp libc_lwip lwip_legacy SRC_CC = main.cc INC_DIR += $(REP_DIR)/src/lib/lwip/include diff --git a/repos/libports/src/test/lwip/udp/server/target.mk b/repos/libports/src/test/lwip/udp/server/target.mk index 024467b82c..668f5b4f7b 100644 --- a/repos/libports/src/test/lwip/udp/server/target.mk +++ b/repos/libports/src/test/lwip/udp/server/target.mk @@ -1,5 +1,5 @@ TARGET = test-lwip-udp-server -LIBS = libc libc_lwip_nic_dhcp libc_lwip lwip +LIBS = libc libc_lwip_nic_dhcp libc_lwip lwip_legacy SRC_CC = main.cc INC_DIR += $(REP_DIR)/src/lib/lwip/include diff --git a/repos/ports/run/dosbox.run b/repos/ports/run/dosbox.run index 47abdd4835..94fbe430f0 100644 --- a/repos/ports/run/dosbox.run +++ b/repos/ports/run/dosbox.run @@ -122,7 +122,7 @@ append boot_modules { core init timer } [audio_drv_binary] { ld.lib.so libc.lib.so vfs.lib.so - libm.lib.so lwip.lib.so libpng.lib.so + libm.lib.so libpng.lib.so stdcxx.lib.so sdl.lib.so sdl_net.lib.so pthread.lib.so zlib.lib.so dosbox dosbox.tar } diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index 1a6ce58868..8bc2153ceb 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -161,7 +161,7 @@ exec tar cfv bin/genode_org.tar -h -C bin/genode_org . set boot_modules { core init timer ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so - lwip.lib.so zlib.lib.so + lwip_legacy.lib.so zlib.lib.so lighttpd genode_org.tar } diff --git a/repos/ports/run/lighttpd.run b/repos/ports/run/lighttpd.run index ec3951b105..db4df32ff7 100644 --- a/repos/ports/run/lighttpd.run +++ b/repos/ports/run/lighttpd.run @@ -109,7 +109,7 @@ install_config $config append boot_modules { core init timer ld.lib.so } [nic_drv_binary] { libc.lib.so vfs.lib.so libm.lib.so posix.lib.so - lwip.lib.so zlib.lib.so + lwip_legacy.lib.so zlib.lib.so lighttpd } diff --git a/repos/ports/run/netperf_lwip.inc b/repos/ports/run/netperf_lwip.inc index 1871f72a2e..ffca444a21 100644 --- a/repos/ports/run/netperf_lwip.inc +++ b/repos/ports/run/netperf_lwip.inc @@ -1,4 +1,4 @@ set netperf_target app/netperf/lwip set netperf_app netserver_lwip -set netperf_stack lwip.lib.so +set netperf_stack lwip_legacy.lib.so set ip_match_string "got IP address (\[0-9]{1,3}.\[0-9]{1,3}.\[0-9]{1,3}.\[0-9]{1,3}).*\n" diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index f31cf521ef..f0b51065d6 100644 --- a/repos/ports/run/noux_net_netcat.run +++ b/repos/ports/run/noux_net_netcat.run @@ -175,7 +175,7 @@ install_config $config set boot_modules { core init timer tcp_terminal nic_bridge ld.lib.so noux_net libc.lib.so vfs.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so - libc_noux.lib.so lwip.lib.so netcat.tar posix.lib.so + libc_noux.lib.so lwip_legacy.lib.so netcat.tar posix.lib.so } # platform-specific modules diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc index 467a6f91ae..1aee4ef53d 100644 --- a/repos/ports/run/vbox_share.inc +++ b/repos/ports/run/vbox_share.inc @@ -118,7 +118,7 @@ foreach pkg {bash coreutils} { set boot_modules { ram_fs noux libc_noux.lib.so posix.lib.so bash.tar coreutils.tar - tcp_terminal lwip.lib.so nic_drv report_rom + tcp_terminal lwip_legacy.lib.so nic_drv report_rom input_merger test.bin template.bat } diff --git a/repos/ports/src/app/dosbox/target.mk b/repos/ports/src/app/dosbox/target.mk index 5b4743a403..130de6bfee 100644 --- a/repos/ports/src/app/dosbox/target.mk +++ b/repos/ports/src/app/dosbox/target.mk @@ -56,6 +56,5 @@ CC_WARN += -Wno-unused-variable -Wno-unused-function -Wno-switch -Wno-unused-val -Wno-parentheses LIBS += libpng libc sdl sdlmain sdl_net stdcxx zlib -LIBS += libc_lwip_nic_dhcp CC_CXX_WARN_STRICT = diff --git a/repos/ports/src/noux/net/net.cc b/repos/ports/src/noux/net/net.cc index be35d835a0..6932f5f525 100644 --- a/repos/ports/src/noux/net/net.cc +++ b/repos/ports/src/noux/net/net.cc @@ -16,7 +16,7 @@ #include #include -#include +#include /* Noux includes */ #include