riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lwip: remove patches

Browse Source 
Moves lwIP to an integration scheme more similar to newer `pkg`s.
This commit is contained in:
Martine Lenders 2018-02-27 09:58:59 +01:00 committed by Martine Lenders
parent 7fde6fc258
commit 95c114bc35
4 changed files with 33 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.dep
View File

@ -445,10 +445,6 @@ ifneq (,$(filter lwip_sock_udp,$(USEMODULE)))
endif
ifneq (,$(filter lwip_%,$(USEMODULE)))
USEMODULE += lwip
endif
ifneq (,$(filter lwip,$(USEMODULE)))
USEPKG += lwip
USEMODULE += core_mbox
USEMODULE += lwip_api

36
pkg/lwip/Makefile
View File

@ -3,9 +3,39 @@ PKG_URL=git://git.savannah.nongnu.org/lwip.git
PKG_VERSION=STABLE-2_0_3_RELEASE
PKG_LICENSE=BSD-3-Clause
.PHONY: all
LWIP_MODULES = lwip_api lwip_core lwip_ipv4 lwip_ipv6 \
lwip_netif lwip_netif_ppp lwip_polarssl
LWIP_USEMODULE = $(filter $(LWIP_MODULES),$(USEMODULE))
LWIP_MODULE_MAKEFILE = $(RIOTBASE)/Makefile.base
all: git-download
"$(MAKE)" -C $(PKG_BUILDDIR)
.PHONY: all $(LWIP_MODULES)
make_module = "$(MAKE)" -f $(LWIP_MODULE_MAKEFILE) MODULE=$(1) -C $(2)
all: git-download lwip
lwip: $(LWIP_USEMODULE)
$(call make_module,$@,$(PKG_BUILDDIR))
lwip_api:
$(call make_module,$@,$(PKG_BUILDDIR)/src/api)
lwip_core:
$(call make_module,$@,$(PKG_BUILDDIR)/src/core)
lwip_ipv4:
$(call make_module,$@,$(PKG_BUILDDIR)/src/core/ipv4)
lwip_ipv6:
$(call make_module,$@,$(PKG_BUILDDIR)/src/core/ipv6)
lwip_netif:
$(call make_module,$@,$(PKG_BUILDDIR)/src/netif)
lwip_netif_ppp:
$(call make_module,$@,$(PKG_BUILDDIR)/src/netif/ppp)
lwip_polarssl:
$(call make_module,$@,$(PKG_BUILDDIR)/src/netif/ppp/polarssl)
include $(RIOTBASE)/pkg/pkg.mk

39
pkg/lwip/patches/0001-Fix-warnings.patch
View File

@ -1,39 +0,0 @@
From f732fca2cd91553aa6f14ed851f84572d374aaa6 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Thu, 12 Nov 2015 16:36:00 +0100
Subject: [PATCH 1/2] Fix warnings
---
src/core/ipv6/nd6.c | 2 +-
src/core/netif.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/core/ipv6/nd6.c b/src/core/ipv6/nd6.c
index 0b36718..b63a9b5 100644
--- a/src/core/ipv6/nd6.c
+++ b/src/core/ipv6/nd6.c
@@ -635,7 +635,7 @@ nd6_input(struct pbuf *p, struct netif *inp)
if (i >= 0) {
neighbor_cache[i].netif = inp;
MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
- ip6_addr_set(&(neighbor_cache[i].next_hop_address), &tmp);
+ ip6_addr_copy(neighbor_cache[i].next_hop_address, tmp);
/* Receiving a message does not prove reachability: only in one direction.
* Delay probe in case we get confirmation of reachability from upper layer (TCP). */
diff --git a/src/core/netif.c b/src/core/netif.c
index 428b148..f7c18e9 100644
--- a/src/core/netif.c
+++ b/src/core/netif.c
@@ -1042,7 +1042,7 @@ netif_ip6_addr_set_parts(struct netif *netif, s8_t addr_idx, u32_t i0, u32_t i1,
LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_STATE, ("netif_ip6_addr_set: netif address being changed\n"));
if (netif_ip6_addr_state(netif, addr_idx) & IP6_ADDR_VALID) {
-#if LWIP_TCP || LWIP_UDP
+#if LWIP_TCP || LWIP_UDP || LWIP_RAW
ip_addr_t new_ipaddr;
IP_ADDR6(&new_ipaddr, i0, i1, i2, i3);
#endif /* LWIP_TCP || LWIP_UDP */
--
2.7.4

119
pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch
View File

@ -1,119 +0,0 @@
From 1111daabb54619247649a5d065ce031edd3a968f Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Thu, 12 Nov 2015 15:43:31 +0100
Subject: [PATCH 2/2] Add RIOT Makefiles
---
Makefile | 23 +++++++++++++++++++++++
src/api/Makefile | 3 +++
src/core/Makefile | 3 +++
src/core/ipv4/Makefile | 3 +++
src/core/ipv6/Makefile | 3 +++
src/netif/Makefile | 3 +++
src/netif/ppp/Makefile | 3 +++
src/netif/ppp/polarssl/Makefile | 3 +++
8 files changed, 44 insertions(+)
create mode 100644 Makefile
create mode 100644 src/api/Makefile
create mode 100644 src/core/Makefile
create mode 100644 src/core/ipv4/Makefile
create mode 100644 src/core/ipv6/Makefile
create mode 100644 src/netif/Makefile
create mode 100644 src/netif/ppp/Makefile
create mode 100644 src/netif/ppp/polarssl/Makefile
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..dbfb087
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+ifneq (,$(filter lwip_api,$(USEMODULE)))
+ DIRS += src/api
+endif
+ifneq (,$(filter lwip_core,$(USEMODULE)))
+ DIRS += src/core
+endif
+ifneq (,$(filter lwip_ipv4,$(USEMODULE)))
+ DIRS += src/core/ipv4
+endif
+ifneq (,$(filter lwip_ipv6,$(USEMODULE)))
+ DIRS += src/core/ipv6
+endif
+ifneq (,$(filter lwip_netif,$(USEMODULE)))
+ DIRS += src/netif
+endif
+ifneq (,$(filter lwip_netif_ppp,$(USEMODULE)))
+ DIRS += src/netif/ppp
+endif
+ifneq (,$(filter lwip_polarssl,$(USEMODULE)))
+ DIRS += src/netif/ppp/polarssl
+endif
+
+include $(RIOTBASE)/Makefile.base
diff --git a/src/api/Makefile b/src/api/Makefile
new file mode 100644
index 0000000..84b4323
--- /dev/null
+++ b/src/api/Makefile
@@ -0,0 +1,3 @@
+MODULE := lwip_api
+
+include $(RIOTBASE)/Makefile.base
diff --git a/src/core/Makefile b/src/core/Makefile
new file mode 100644
index 0000000..2943234
--- /dev/null
+++ b/src/core/Makefile
@@ -0,0 +1,3 @@
+MODULE := lwip_core
+
+include $(RIOTBASE)/Makefile.base
diff --git a/src/core/ipv4/Makefile b/src/core/ipv4/Makefile
new file mode 100644
index 0000000..b3a7a5e
--- /dev/null
+++ b/src/core/ipv4/Makefile
@@ -0,0 +1,3 @@
+MODULE := lwip_ipv4
+
+include $(RIOTBASE)/Makefile.base
diff --git a/src/core/ipv6/Makefile b/src/core/ipv6/Makefile
new file mode 100644
index 0000000..e26e51f
--- /dev/null
+++ b/src/core/ipv6/Makefile
@@ -0,0 +1,3 @@
+MODULE := lwip_ipv6
+
+include $(RIOTBASE)/Makefile.base
diff --git a/src/netif/Makefile b/src/netif/Makefile
new file mode 100644
index 0000000..bb86d8f
--- /dev/null
+++ b/src/netif/Makefile
@@ -0,0 +1,3 @@
+MODULE := lwip_netif
+
+include $(RIOTBASE)/Makefile.base
diff --git a/src/netif/ppp/Makefile b/src/netif/ppp/Makefile
new file mode 100644
index 0000000..bd21288
--- /dev/null
+++ b/src/netif/ppp/Makefile
@@ -0,0 +1,3 @@
+MODULE := lwip_netif_ppp
+
+include $(RIOTBASE)/Makefile.base
diff --git a/src/netif/ppp/polarssl/Makefile b/src/netif/ppp/polarssl/Makefile
new file mode 100644
index 0000000..6030171
--- /dev/null
+++ b/src/netif/ppp/polarssl/Makefile
@@ -0,0 +1,3 @@
+MODULE := lwip_polarssl
+
+include $(RIOTBASE)/Makefile.base
--
2.7.4