diff --git a/repos/libports/lib/import/import-lwip.mk b/repos/libports/lib/import/import-legacy_lwip.mk similarity index 100% rename from repos/libports/lib/import/import-lwip.mk rename to repos/libports/lib/import/import-legacy_lwip.mk diff --git a/repos/libports/lib/mk/lwip.mk b/repos/libports/lib/mk/legacy_lwip.mk similarity index 93% rename from repos/libports/lib/mk/lwip.mk rename to repos/libports/lib/mk/legacy_lwip.mk index c8838e739b..de8a535838 100644 --- a/repos/libports/lib/mk/lwip.mk +++ b/repos/libports/lib/mk/legacy_lwip.mk @@ -26,7 +26,7 @@ INC_DIR += $(LWIP_PORT_DIR)/include/lwip \ $(LWIPDIR)/include/ipv4 \ $(LWIPDIR)/include/api \ $(LWIPDIR)/include/netif \ - $(REP_DIR)/src/lib/lwip/include + $(REP_DIR)/src/lib/legacy_lwip/include vpath %.c $(sort $(dir \ $(COREFILES) $(CORE4FILES) $(CORE6FILES) $(NETIFFILES))) diff --git a/repos/libports/lib/mk/vfs_lwip.mk b/repos/libports/lib/mk/vfs_legacy_lwip.mk similarity index 62% rename from repos/libports/lib/mk/vfs_lwip.mk rename to repos/libports/lib/mk/vfs_legacy_lwip.mk index 079b15315e..83d450609e 100644 --- a/repos/libports/lib/mk/vfs_lwip.mk +++ b/repos/libports/lib/mk/vfs_legacy_lwip.mk @@ -1,13 +1,13 @@ SRC_CC = vfs.cc printf.cc rand.cc sys_arch.cc -VFS_DIR = $(REP_DIR)/src/lib/vfs/lwip +VFS_DIR = $(REP_DIR)/src/lib/vfs/legacy_lwip INC_DIR += $(VFS_DIR) -REP_INC_DIR += src/lib/lwip/include +REP_INC_DIR += src/lib/legacy_lwip/include LD_OPT += --version-script=$(VFS_DIR)/symbol.map -LIBS += lwip format +LIBS += legacy_lwip format vpath %.cc $(VFS_DIR) diff --git a/repos/libports/recipes/api/lwip/content.mk b/repos/libports/recipes/api/legacy_lwip/content.mk similarity index 76% rename from repos/libports/recipes/api/lwip/content.mk rename to repos/libports/recipes/api/legacy_lwip/content.mk index c789f04d8d..30900e0713 100644 --- a/repos/libports/recipes/api/lwip/content.mk +++ b/repos/libports/recipes/api/legacy_lwip/content.mk @@ -1,7 +1,7 @@ MIRROR_FROM_REP_DIR := \ - $(shell cd $(REP_DIR); find src/lib/lwip -type f) \ - lib/import/import-lwip.mk \ - lib/mk/lwip.mk \ + $(shell cd $(REP_DIR); find src/lib/legacy_lwip -type f) \ + lib/import/import-legacy_lwip.mk \ + lib/mk/legacy_lwip.mk \ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/lwip) diff --git a/repos/libports/recipes/api/lwip/hash b/repos/libports/recipes/api/legacy_lwip/hash similarity index 100% rename from repos/libports/recipes/api/lwip/hash rename to repos/libports/recipes/api/legacy_lwip/hash diff --git a/repos/libports/recipes/src/vfs_lwip/content.mk b/repos/libports/recipes/src/vfs_legacy_lwip/content.mk similarity index 63% rename from repos/libports/recipes/src/vfs_lwip/content.mk rename to repos/libports/recipes/src/vfs_legacy_lwip/content.mk index 63a34fae50..d40a9c5426 100644 --- a/repos/libports/recipes/src/vfs_lwip/content.mk +++ b/repos/libports/recipes/src/vfs_legacy_lwip/content.mk @@ -1,4 +1,4 @@ -MIRROR_FROM_REP_DIR := src/lib/vfs/lwip lib/mk/vfs_lwip.mk +MIRROR_FROM_REP_DIR := src/lib/vfs/legacy_lwip lib/mk/vfs_legacy_lwip.mk content: $(MIRROR_FROM_REP_DIR) LICENSE diff --git a/repos/libports/recipes/src/vfs_lwip/hash b/repos/libports/recipes/src/vfs_legacy_lwip/hash similarity index 100% rename from repos/libports/recipes/src/vfs_lwip/hash rename to repos/libports/recipes/src/vfs_legacy_lwip/hash diff --git a/repos/libports/recipes/src/vfs_lwip/used_apis b/repos/libports/recipes/src/vfs_legacy_lwip/used_apis similarity index 80% rename from repos/libports/recipes/src/vfs_lwip/used_apis rename to repos/libports/recipes/src/vfs_legacy_lwip/used_apis index a196868487..828fadb11c 100644 --- a/repos/libports/recipes/src/vfs_lwip/used_apis +++ b/repos/libports/recipes/src/vfs_legacy_lwip/used_apis @@ -1,5 +1,5 @@ base -lwip +legacy_lwip nic_session os so diff --git a/repos/libports/src/lib/lwip/include/arch/cc.h b/repos/libports/src/lib/legacy_lwip/include/arch/cc.h similarity index 100% rename from repos/libports/src/lib/lwip/include/arch/cc.h rename to repos/libports/src/lib/legacy_lwip/include/arch/cc.h diff --git a/repos/libports/src/lib/lwip/include/arch/perf.h b/repos/libports/src/lib/legacy_lwip/include/arch/perf.h similarity index 100% rename from repos/libports/src/lib/lwip/include/arch/perf.h rename to repos/libports/src/lib/legacy_lwip/include/arch/perf.h diff --git a/repos/libports/src/lib/lwip/include/lwipopts.h b/repos/libports/src/lib/legacy_lwip/include/lwipopts.h similarity index 100% rename from repos/libports/src/lib/lwip/include/lwipopts.h rename to repos/libports/src/lib/legacy_lwip/include/lwipopts.h diff --git a/repos/libports/src/lib/lwip/include/stdlib.h b/repos/libports/src/lib/legacy_lwip/include/stdlib.h similarity index 100% rename from repos/libports/src/lib/lwip/include/stdlib.h rename to repos/libports/src/lib/legacy_lwip/include/stdlib.h diff --git a/repos/libports/src/lib/lwip/include/string.h b/repos/libports/src/lib/legacy_lwip/include/string.h similarity index 100% rename from repos/libports/src/lib/lwip/include/string.h rename to repos/libports/src/lib/legacy_lwip/include/string.h diff --git a/repos/libports/src/lib/lwip/memmove.patch b/repos/libports/src/lib/legacy_lwip/memmove.patch similarity index 100% rename from repos/libports/src/lib/lwip/memmove.patch rename to repos/libports/src/lib/legacy_lwip/memmove.patch diff --git a/repos/libports/src/lib/vfs/lwip/lwip_genode_init.h b/repos/libports/src/lib/vfs/legacy_lwip/lwip_genode_init.h similarity index 100% rename from repos/libports/src/lib/vfs/lwip/lwip_genode_init.h rename to repos/libports/src/lib/vfs/legacy_lwip/lwip_genode_init.h diff --git a/repos/libports/src/lib/vfs/lwip/nic_netif.h b/repos/libports/src/lib/vfs/legacy_lwip/nic_netif.h similarity index 100% rename from repos/libports/src/lib/vfs/lwip/nic_netif.h rename to repos/libports/src/lib/vfs/legacy_lwip/nic_netif.h diff --git a/repos/libports/src/lib/vfs/lwip/printf.cc b/repos/libports/src/lib/vfs/legacy_lwip/printf.cc similarity index 100% rename from repos/libports/src/lib/vfs/lwip/printf.cc rename to repos/libports/src/lib/vfs/legacy_lwip/printf.cc diff --git a/repos/libports/src/lib/vfs/lwip/rand.cc b/repos/libports/src/lib/vfs/legacy_lwip/rand.cc similarity index 100% rename from repos/libports/src/lib/vfs/lwip/rand.cc rename to repos/libports/src/lib/vfs/legacy_lwip/rand.cc diff --git a/repos/libports/src/lib/vfs/lwip/symbol.map b/repos/libports/src/lib/vfs/legacy_lwip/symbol.map similarity index 100% rename from repos/libports/src/lib/vfs/lwip/symbol.map rename to repos/libports/src/lib/vfs/legacy_lwip/symbol.map diff --git a/repos/libports/src/lib/vfs/lwip/sys_arch.cc b/repos/libports/src/lib/vfs/legacy_lwip/sys_arch.cc similarity index 100% rename from repos/libports/src/lib/vfs/lwip/sys_arch.cc rename to repos/libports/src/lib/vfs/legacy_lwip/sys_arch.cc diff --git a/repos/libports/src/lib/vfs/lwip/vfs.cc b/repos/libports/src/lib/vfs/legacy_lwip/vfs.cc similarity index 100% rename from repos/libports/src/lib/vfs/lwip/vfs.cc rename to repos/libports/src/lib/vfs/legacy_lwip/vfs.cc