vfs_lxip: adapt to 'genode_socket' C-API

Adjust the plugin to use the socket C-API found under
dde_linux/src/lib/lxip/include/genode_c_api/socket.h'.

This is the first minor step in generalizing the plugin.

isse #5104
This commit is contained in:
Sebastian Sumpf 2024-01-24 19:56:39 +01:00 committed by Christian Helmuth
parent 93b3e7d12f
commit 561a9e7a72
5 changed files with 267 additions and 391 deletions

View File

@ -1,23 +1,11 @@
SHARED_LIB = yes
VFS_DIR = $(REP_DIR)/src/lib/vfs/lxip
LXIP_DIR = $(REP_DIR)/src/lib/lxip
LIBS += lxip lxip_include
INC_DIR += $(VFS_DIR)
LD_OPT += --version-script=$(VFS_DIR)/symbol.map
LIBS = lxip format
SRC_CC = vfs.cc
LD_OPT += --version-script=$(VFS_DIR)/symbol.map
vpath %.cc $(REP_DIR)/src/lib/vfs/lxip
CC_OPT += -Wno-error=missing-field-initializers
CC_OPT += -Wno-missing-field-initializers
SETUP_SUFFIX =
CC_OPT += -DSETUP_SUFFIX=$(SETUP_SUFFIX)
CC_OPT += -U__linux__ -D__KERNEL__
CC_OPT += -DCONFIG_INET -DCONFIG_BASE_SMALL=0 -DCONFIG_DEBUG_LOCK_ALLOC \
-DCONFIG_IP_PNP_DHCP
CC_C_OPT += -include $(LXIP_DIR)/include/lx_emul.h
CC_CXX_OPT += -fpermissive
CC_CXX_WARN_STRICT =
vpath %.cc $(VFS_DIR)

View File

@ -1,31 +1,18 @@
LIB_MK := $(addprefix lib/mk/,lxip.mk lxip_include.mk vfs_lxip.mk) \
$(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/lx_kit_setjmp.mk)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
LIB_MK := $(addprefix lib/mk/,lxip.inc vfs_lxip.mk) \
$(foreach SPEC,x86_32 x86_64 arm_v6 arm_v7 arm_v8,lib/mk/spec/$(SPEC)/lxip.mk)
MIRROR_FROM_REP_DIR := $(LIB_MK) \
lib/import/import-lxip_include.mk \
include/lxip src/include/legacy src/lib/legacy/lx_kit \
src/lib/lx_kit/spec \
$(foreach SPEC, \
arm arm_64 arm_v6 arm_v7 x86 x86_32 x86_64, \
src/include/spec/$(SPEC)) \
$(shell cd $(REP_DIR); find src/lib/lxip -type f) \
$(shell cd $(REP_DIR); find src/lib/vfs -type f)
lib/import/import-lxip.mk \
src/lib/lxip \
src/lib/vfs/lxip
MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/lib/lxip -type f)
content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR)
content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
$(MIRROR_FROM_PORT_DIR):
mkdir -p $(dir $@)
cp -r $(PORT_DIR)/$@ $@
PORT_DIR := $(call port_dir,$(GENODE_DIR)/repos/dde_linux/ports/linux)
content: LICENSE
LICENSE:
( echo "LxIP is based on Linux, which is licensed under the"; \
echo "GNU General Public License version 2, see:"; \
echo "https://www.kernel.org/pub/linux/kernel/COPYING" ) > $@
cp $(PORT_DIR)/src/linux/COPYING $@

View File

@ -1 +1 @@
2023-12-12 f13a699fd3656588b8118c8d9d6bbd21c03f3a52
2023-11-09-c c5ef8af4feaeb1f2f127c703d6d3ed3512805ad9

View File

@ -1,7 +1,10 @@
base
format
genode_c_api
jitterentropy
nic_session
os
so
timer_session
vfs
format
virt_linux

File diff suppressed because it is too large Load Diff