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
This commit is contained in:
parent
b1389416d2
commit
e36ddaf659
|
@ -93,7 +93,7 @@ install_config $config
|
||||||
# generic modules
|
# generic modules
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core ld.lib.so init timer usb_drv
|
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
|
append_platform_drv_boot_modules
|
||||||
|
|
|
@ -100,7 +100,7 @@ install_config $config
|
||||||
# generic modules
|
# generic modules
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core ld.lib.so init timer usb_drv
|
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
|
tcp_terminal
|
||||||
test-terminal_echo
|
test-terminal_echo
|
||||||
}
|
}
|
||||||
|
|
|
@ -142,7 +142,7 @@ set boot_modules {
|
||||||
wifi.lib.so
|
wifi.lib.so
|
||||||
wifi_drv
|
wifi_drv
|
||||||
|
|
||||||
test-lwip_httpsrv lwip.lib.so
|
test-lwip_httpsrv lwip_legacy.lib.so
|
||||||
}
|
}
|
||||||
|
|
||||||
append boot_modules $firmware_modules
|
append boot_modules $firmware_modules
|
||||||
|
|
|
@ -180,7 +180,7 @@ catch { exec dd if=/dev/zero of=bin/index.bin bs=512 count=400 }
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core ld.lib.so init timer
|
core ld.lib.so init timer
|
||||||
libc.lib.so vfs.lib.so libm.lib.so posix.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 nic_bridge http_blk index.bin test-rom_blk
|
lighttpd nic_bridge http_blk index.bin test-rom_blk
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ install_config $config
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core ld.lib.so init timer
|
core ld.lib.so init timer
|
||||||
nic_drv
|
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
|
tcp_terminal
|
||||||
test-terminal_echo
|
test-terminal_echo
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include <base/child.h>
|
#include <base/child.h>
|
||||||
#include <base/log.h>
|
#include <base/log.h>
|
||||||
#include <base/sleep.h>
|
#include <base/sleep.h>
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
#include <nic/packet_allocator.h>
|
#include <nic/packet_allocator.h>
|
||||||
|
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
INC_DIR += $(call select_from_ports,lwip)/include/lwip
|
|
||||||
INC_DIR += $(call select_from_repositories,include/lwip)
|
|
2
repos/libports/lib/import/import-lwip_legacy.mk
Normal file
2
repos/libports/lib/import/import-lwip_legacy.mk
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
INC_DIR += $(call select_from_ports,lwip_legacy)/include/lwip_legacy
|
||||||
|
INC_DIR += $(call select_from_repositories,include/lwip_legacy)
|
|
@ -2,6 +2,6 @@ SRC_CC = init.cc plugin.cc
|
||||||
|
|
||||||
vpath %.cc $(REP_DIR)/src/lib/libc_lwip
|
vpath %.cc $(REP_DIR)/src/lib/libc_lwip
|
||||||
|
|
||||||
LIBS += lwip libc
|
LIBS += lwip_legacy libc
|
||||||
|
|
||||||
CC_CXX_WARN_STRICT =
|
CC_CXX_WARN_STRICT =
|
||||||
|
|
|
@ -2,6 +2,6 @@ SRC_CC = init.cc
|
||||||
|
|
||||||
vpath %.cc $(REP_DIR)/src/lib/libc_lwip_loopback
|
vpath %.cc $(REP_DIR)/src/lib/libc_lwip_loopback
|
||||||
|
|
||||||
LIBS += lwip libc libc_lwip
|
LIBS += lwip_legacy libc libc_lwip
|
||||||
|
|
||||||
CC_CXX_WARN_STRICT =
|
CC_CXX_WARN_STRICT =
|
||||||
|
|
|
@ -2,6 +2,6 @@ SRC_CC = plugin.cc
|
||||||
|
|
||||||
vpath %.cc $(REP_DIR)/src/lib/libc_lwip_nic_dhcp
|
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 =
|
CC_CXX_WARN_STRICT =
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
# The library implementes TCP and UDP as well as DNS and DHCP.
|
# The library implementes TCP and UDP as well as DNS and DHCP.
|
||||||
#
|
#
|
||||||
|
|
||||||
LWIP_PORT_DIR := $(call select_from_ports,lwip)
|
LWIP_PORT_DIR := $(call select_from_ports,lwip_legacy)
|
||||||
LWIP_DIR := $(LWIP_PORT_DIR)/src/lib/lwip
|
LWIP_DIR := $(LWIP_PORT_DIR)/src/lib/lwip_legacy
|
||||||
|
|
||||||
# Genode platform files
|
# Genode platform files
|
||||||
SRC_CC = nic.cc printf.cc sys_arch.cc
|
SRC_CC = nic.cc printf.cc sys_arch.cc
|
||||||
|
@ -30,17 +30,17 @@ D_OPTS = ERRNO
|
||||||
D_OPTS := $(addprefix -D,$(D_OPTS))
|
D_OPTS := $(addprefix -D,$(D_OPTS))
|
||||||
CC_DEF += $(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 \
|
INC_DIR += $(REP_DIR)/include/lwip_legacy \
|
||||||
$(LWIP_PORT_DIR)/include/lwip \
|
$(LWIP_PORT_DIR)/include/lwip_legacy \
|
||||||
$(LWIP_DIR)/src/include \
|
$(LWIP_DIR)/src/include \
|
||||||
$(LWIP_DIR)/src/include/ipv4 \
|
$(LWIP_DIR)/src/include/ipv4 \
|
||||||
$(LWIP_DIR)/src/include/api \
|
$(LWIP_DIR)/src/include/api \
|
||||||
$(LWIP_DIR)/src/include/netif \
|
$(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
|
||||||
vpath %.c $(LWIP_DIR)/src/core/ipv4
|
vpath %.c $(LWIP_DIR)/src/core/ipv4
|
||||||
vpath %.c $(LWIP_DIR)/src/api
|
vpath %.c $(LWIP_DIR)/src/api
|
|
@ -1 +0,0 @@
|
||||||
d84dafd43c71b0c325246801d7f2f5ee8ec7bbd9
|
|
1
repos/libports/ports/lwip_legacy.hash
Normal file
1
repos/libports/ports/lwip_legacy.hash
Normal file
|
@ -0,0 +1 @@
|
||||||
|
7f5610426ed8c4c64903136122d9ba58836cdc89
|
|
@ -4,13 +4,13 @@ DOWNLOADS := lwip.git window_scaling_patch.file
|
||||||
|
|
||||||
URL(lwip) := git://git.savannah.nongnu.org/lwip.git
|
URL(lwip) := git://git.savannah.nongnu.org/lwip.git
|
||||||
REV(lwip) := fe63f36656bd66b4051bdfab93e351a584337d7c
|
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
|
URL(window_scaling_patch) := https://savannah.nongnu.org/patch/download.php?file_id=28026
|
||||||
NAME(window_scaling_patch) := src/lib/lwip/window_scaling.patch
|
NAME(window_scaling_patch) := src/lib/lwip_legacy/window_scaling.patch
|
||||||
SHA(window_scaling_patch) := 5be562adddc05fa00ecead8fbca8d7797e76670e
|
SHA(window_scaling_patch) := b8dcaa2e0508208222e3e84a42cbe3eba6f6bfc728a5ba62d0d6c4c0c548e46f
|
||||||
|
|
||||||
PATCHES := $(addprefix src/lib/lwip/,window_scaling.patch \
|
PATCHES := $(addprefix src/lib/lwip_legacy/,window_scaling.patch \
|
||||||
errno.patch \
|
errno.patch \
|
||||||
libc_select_notify.patch \
|
libc_select_notify.patch \
|
||||||
sockets_c_errno.patch \
|
sockets_c_errno.patch \
|
||||||
|
@ -19,12 +19,12 @@ PATCHES := $(addprefix src/lib/lwip/,window_scaling.patch \
|
||||||
api_msg.patch \
|
api_msg.patch \
|
||||||
nonblocking_connect.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 \
|
DIR_CONTENT(include/lwip_legacy/lwip) := src/lib/lwip_legacy/src/include/lwip/*.h \
|
||||||
src/lib/lwip/src/include/ipv4/lwip/*.h \
|
src/lib/lwip_legacy/src/include/ipv4/lwip/*.h \
|
||||||
src/lib/lwip/src/include/ipv6/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
|
|
@ -125,7 +125,7 @@ install_config $config
|
||||||
# generic modules
|
# generic modules
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init timer
|
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
|
# platform-specific modules
|
||||||
|
|
|
@ -58,7 +58,7 @@ install_config $config
|
||||||
|
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init timer linux_nic_drv
|
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
|
build_boot_image $boot_modules
|
||||||
|
|
|
@ -107,7 +107,7 @@ append boot_modules {
|
||||||
ld.lib.so
|
ld.lib.so
|
||||||
libc.lib.so vfs.lib.so
|
libc.lib.so vfs.lib.so
|
||||||
libm.lib.so
|
libm.lib.so
|
||||||
lwip.lib.so
|
lwip_legacy.lib.so
|
||||||
test-http_clnt
|
test-http_clnt
|
||||||
test-lwip_httpsrv_static
|
test-lwip_httpsrv_static
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,7 +140,7 @@ append boot_modules {
|
||||||
ld.lib.so
|
ld.lib.so
|
||||||
libc.lib.so vfs.lib.so
|
libc.lib.so vfs.lib.so
|
||||||
posix.lib.so
|
posix.lib.so
|
||||||
lwip.lib.so
|
lwip_legacy.lib.so
|
||||||
test-http_clnt
|
test-http_clnt
|
||||||
libm.lib.so
|
libm.lib.so
|
||||||
zlib.lib.so
|
zlib.lib.so
|
||||||
|
|
|
@ -61,7 +61,7 @@ proc server_config { name prot ip_addr gateway netmask nic port } {
|
||||||
|
|
||||||
set boot_modules "
|
set boot_modules "
|
||||||
core init timer nic_router nic_bridge nic_loopback ld.lib.so
|
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]"
|
[client_bin http] [server_bin http] [platform_drv_boot_modules]"
|
||||||
|
|
||||||
append qemu_args "-nographic "
|
append qemu_args "-nographic "
|
||||||
|
|
|
@ -130,7 +130,7 @@ install_config $config
|
||||||
# generic modules
|
# generic modules
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init timer
|
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
|
test-ping_client_libc_lwip
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ install_config $config
|
||||||
# generic modules
|
# generic modules
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init timer
|
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
|
test-ping_server_libc_lwip
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include <lwip/netdb.h>
|
#include <lwip/netdb.h>
|
||||||
}
|
}
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
#include <lwip/sockets.h>
|
#include <lwip/sockets.h>
|
||||||
|
|
||||||
/* lwip and libc have different definitions for the FD_* macros and renaming
|
/* lwip and libc have different definitions for the FD_* macros and renaming
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
#include <base/log.h>
|
#include <base/log.h>
|
||||||
|
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
|
|
||||||
extern void create_lwip_plugin();
|
extern void create_lwip_plugin();
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
#include <nic/packet_allocator.h>
|
#include <nic/packet_allocator.h>
|
||||||
#include <util/string.h>
|
#include <util/string.h>
|
||||||
|
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
|
|
||||||
#undef AF_INET6
|
#undef AF_INET6
|
||||||
#undef MSG_PEEK
|
#undef MSG_PEEK
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#include <os/timed_semaphore.h>
|
#include <os/timed_semaphore.h>
|
||||||
|
|
||||||
/* LwIP includes */
|
/* LwIP includes */
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
#include <ring_buffer.h>
|
#include <ring_buffer.h>
|
||||||
#include <thread.h>
|
#include <thread.h>
|
||||||
#include <verbose.h>
|
#include <verbose.h>
|
|
@ -26,7 +26,7 @@ extern "C" {
|
||||||
#include <netif/etharp.h>
|
#include <netif/etharp.h>
|
||||||
}
|
}
|
||||||
|
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-http_clnt
|
TARGET = test-http_clnt
|
||||||
LIBS = lwip libc
|
LIBS = lwip_legacy libc
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
|
|
||||||
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
||||||
|
|
|
@ -29,7 +29,7 @@ extern "C" {
|
||||||
#include <lwip/api.h>
|
#include <lwip/api.h>
|
||||||
}
|
}
|
||||||
|
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
|
|
||||||
|
|
||||||
const static char http_html_hdr[] =
|
const static char http_html_hdr[] =
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-lwip_httpsrv
|
TARGET = test-lwip_httpsrv
|
||||||
LIBS = lwip posix
|
LIBS = lwip_legacy posix
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
|
|
||||||
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
||||||
|
|
|
@ -30,7 +30,7 @@ extern "C" {
|
||||||
#include <lwip/api.h>
|
#include <lwip/api.h>
|
||||||
}
|
}
|
||||||
|
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
|
|
||||||
using Response = Genode::String<1024>;
|
using Response = Genode::String<1024>;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-lwip_httpsrv_static
|
TARGET = test-lwip_httpsrv_static
|
||||||
LIBS = lwip libc
|
LIBS = lwip_legacy libc
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
|
|
||||||
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-lwip_loop
|
TARGET = test-lwip_loop
|
||||||
LIBS = lwip posix libc_lwip_loopback
|
LIBS = lwip_legacy posix libc_lwip_loopback
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
|
|
||||||
CC_CXX_WARN_STRICT =
|
CC_CXX_WARN_STRICT =
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-ping_client_libc_lwip
|
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
|
SRC_CC = main.cc pingpong.cc
|
||||||
|
|
||||||
vpath main.cc $(PRG_DIR)/..
|
vpath main.cc $(PRG_DIR)/..
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-ping_client_lwip
|
TARGET = test-ping_client_lwip
|
||||||
LIBS = posix lwip
|
LIBS = posix lwip_legacy
|
||||||
SRC_CC = main.cc pingpong.cc
|
SRC_CC = main.cc pingpong.cc
|
||||||
|
|
||||||
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-ping_server_libc_lwip
|
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
|
SRC_CC = main.cc pingpong.cc
|
||||||
|
|
||||||
vpath main.cc $(PRG_DIR)/..
|
vpath main.cc $(PRG_DIR)/..
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-ping_server_lwip
|
TARGET = test-ping_server_lwip
|
||||||
LIBS = posix lwip
|
LIBS = posix lwip_legacy
|
||||||
SRC_CC = main.cc pingpong.cc
|
SRC_CC = main.cc pingpong.cc
|
||||||
|
|
||||||
CC_OPT += -DLWIP_NATIVE
|
CC_OPT += -DLWIP_NATIVE
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
#ifdef LWIP_NATIVE
|
#ifdef LWIP_NATIVE
|
||||||
#include <nic/packet_allocator.h>
|
#include <nic/packet_allocator.h>
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../pingpong.h"
|
#include "../pingpong.h"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-lwip-udp-client
|
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
|
SRC_CC = main.cc
|
||||||
|
|
||||||
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
TARGET = test-lwip-udp-server
|
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
|
SRC_CC = main.cc
|
||||||
|
|
||||||
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
INC_DIR += $(REP_DIR)/src/lib/lwip/include
|
||||||
|
|
|
@ -122,7 +122,7 @@ append boot_modules {
|
||||||
core init timer } [audio_drv_binary] {
|
core init timer } [audio_drv_binary] {
|
||||||
ld.lib.so
|
ld.lib.so
|
||||||
libc.lib.so vfs.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
|
stdcxx.lib.so sdl.lib.so sdl_net.lib.so pthread.lib.so zlib.lib.so
|
||||||
dosbox dosbox.tar
|
dosbox dosbox.tar
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,7 +161,7 @@ exec tar cfv bin/genode_org.tar -h -C bin/genode_org .
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init timer ld.lib.so
|
core init timer ld.lib.so
|
||||||
libc.lib.so vfs.lib.so libm.lib.so posix.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
|
lighttpd genode_org.tar
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -109,7 +109,7 @@ install_config $config
|
||||||
append boot_modules {
|
append boot_modules {
|
||||||
core init timer ld.lib.so } [nic_drv_binary] {
|
core init timer ld.lib.so } [nic_drv_binary] {
|
||||||
libc.lib.so vfs.lib.so libm.lib.so posix.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
|
lighttpd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
set netperf_target app/netperf/lwip
|
set netperf_target app/netperf/lwip
|
||||||
set netperf_app netserver_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"
|
set ip_match_string "got IP address (\[0-9]{1,3}.\[0-9]{1,3}.\[0-9]{1,3}.\[0-9]{1,3}).*\n"
|
||||||
|
|
|
@ -175,7 +175,7 @@ install_config $config
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init timer tcp_terminal nic_bridge
|
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
|
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
|
# platform-specific modules
|
||||||
|
|
|
@ -118,7 +118,7 @@ foreach pkg {bash coreutils} {
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
ram_fs
|
ram_fs
|
||||||
noux libc_noux.lib.so posix.lib.so bash.tar coreutils.tar
|
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
|
input_merger
|
||||||
test.bin template.bat
|
test.bin template.bat
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,6 +56,5 @@ CC_WARN += -Wno-unused-variable -Wno-unused-function -Wno-switch -Wno-unused-val
|
||||||
-Wno-parentheses
|
-Wno-parentheses
|
||||||
|
|
||||||
LIBS += libpng libc sdl sdlmain sdl_net stdcxx zlib
|
LIBS += libpng libc sdl sdlmain sdl_net stdcxx zlib
|
||||||
LIBS += libc_lwip_nic_dhcp
|
|
||||||
|
|
||||||
CC_CXX_WARN_STRICT =
|
CC_CXX_WARN_STRICT =
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#include <dataspace/client.h>
|
#include <dataspace/client.h>
|
||||||
#include <base/lock.h>
|
#include <base/lock.h>
|
||||||
|
|
||||||
#include <lwip/genode.h>
|
#include <lwip_legacy/genode.h>
|
||||||
|
|
||||||
/* Noux includes */
|
/* Noux includes */
|
||||||
#include <child.h>
|
#include <child.h>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user