From e521e100f1d1df244d06f851b516364bb328fae4 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 2 Aug 2018 15:51:16 +0200 Subject: [PATCH] Move LwIP to API package This fix vfs_lwip recursion on archive creation. Ref #2335 --- repos/libports/recipes/api/lwip/content.mk | 20 +++++++++++++++++++ repos/libports/recipes/api/lwip/hash | 1 + .../libports/recipes/src/vfs_lwip/content.mk | 19 +++--------------- repos/libports/recipes/src/vfs_lwip/used_apis | 2 +- 4 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 repos/libports/recipes/api/lwip/content.mk create mode 100644 repos/libports/recipes/api/lwip/hash diff --git a/repos/libports/recipes/api/lwip/content.mk b/repos/libports/recipes/api/lwip/content.mk new file mode 100644 index 0000000000..f83371e43e --- /dev/null +++ b/repos/libports/recipes/api/lwip/content.mk @@ -0,0 +1,20 @@ +MIRROR_FROM_REP_DIR := \ + $(shell cd $(REP_DIR); find include/lwip src/lib/lwip -type f) \ + lib/import/import-lwip.mk \ + lib/mk/lwip.mk \ + +PORT_DIR := $(call port_dir,$(REP_DIR)/ports/lwip) + +MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find include src -type f) + +content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) LICENSE + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +$(MIRROR_FROM_PORT_DIR): + mkdir -p $(dir $@) + cp -r $(PORT_DIR)/$@ $@ + +LICENSE: + cp $(PORT_DIR)/src/lib/lwip/COPYING $@ diff --git a/repos/libports/recipes/api/lwip/hash b/repos/libports/recipes/api/lwip/hash new file mode 100644 index 0000000000..68f4af5433 --- /dev/null +++ b/repos/libports/recipes/api/lwip/hash @@ -0,0 +1 @@ +2018-07-30 3436d97a6c2da7fa8787969607de21eb5707f68b diff --git a/repos/libports/recipes/src/vfs_lwip/content.mk b/repos/libports/recipes/src/vfs_lwip/content.mk index 5e716d70d1..63a34fae50 100644 --- a/repos/libports/recipes/src/vfs_lwip/content.mk +++ b/repos/libports/recipes/src/vfs_lwip/content.mk @@ -1,22 +1,9 @@ -MIRROR_FROM_REP_DIR := \ - $(shell cd $(REP_DIR); find include/lwip src/lib/lwip src/lib/vfs/lwip -type f) \ - lib/import/import-lwip.mk \ - lib/mk/lwip.mk \ - lib/mk/vfs_lwip.mk \ - recipes/src/vfs_lwip \ +MIRROR_FROM_REP_DIR := src/lib/vfs/lwip lib/mk/vfs_lwip.mk -PORT_DIR := $(call port_dir,$(REP_DIR)/ports/lwip) - -MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find include src -type f) - -content: $(MIRROR_FROM_REP_DIR) $(MIRROR_FROM_PORT_DIR) LICENSE +content: $(MIRROR_FROM_REP_DIR) LICENSE $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -$(MIRROR_FROM_PORT_DIR): - mkdir -p $(dir $@) - cp -r $(PORT_DIR)/$@ $@ - LICENSE: - cp $(PORT_DIR)/src/lib/lwip/COPYING $@ + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/vfs_lwip/used_apis b/repos/libports/recipes/src/vfs_lwip/used_apis index baa484fb84..869365b449 100644 --- a/repos/libports/recipes/src/vfs_lwip/used_apis +++ b/repos/libports/recipes/src/vfs_lwip/used_apis @@ -1,5 +1,5 @@ base -libc +lwip nic_session os so