From 95c114bc358821bc70571638c87740b60eda0937 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Tue, 27 Feb 2018 09:58:59 +0100
Subject: [PATCH] lwip: remove patches
Moves lwIP to an integration scheme more similar to newer `pkg`s.
---
Makefile.dep | 4 --
pkg/lwip/Makefile | 36 ++++++++++++++++--
pkg/lwip/patches/0001-Fix-warnings.patch | Bin 1571 -> 0 bytes
.../patches/0002-Add-RIOT-Makefiles.patch | Bin 3176 -> 0 bytes
4 files changed, 33 insertions(+), 7 deletions(-)
delete mode 100644 pkg/lwip/patches/0001-Fix-warnings.patch
delete mode 100644 pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch
diff --git a/Makefile.dep b/Makefile.dep
index e083323e1b..cc60f4681d 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -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
diff --git a/pkg/lwip/Makefile b/pkg/lwip/Makefile
index 0477137300..448027a187 100644
--- a/pkg/lwip/Makefile
+++ b/pkg/lwip/Makefile
@@ -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
diff --git a/pkg/lwip/patches/0001-Fix-warnings.patch b/pkg/lwip/patches/0001-Fix-warnings.patch
deleted file mode 100644
index c90f306ba72ebeebda08e245e705f1de5a13594c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1571
zcma)6`%j}l5dNLNVxozm<xyUxwVuXmt!JX9(R$|M8M468?u9M{sE?d~{LMn^`KZZ}
z(qU(2zn%T|n;jR~0+OEVBoT9>c-QWBUB>*x_Au^u?WFH@drs{3JVsu)$OK$t4t5VL
zYf%5du`F8|6U+cESW$6-aE>CzqJ(b?#?!+^<2BO8YvS@i8L<inFr6=TupPL}9tg(n
zg6$7npKw95Y|B!vm*H=WssY?hhSTHkV0WB*81pB1WQE{jRw{~N7z&g{)QPeJJ3N2z
zJ0kYY2wuPe?QKk8#S;q9vyM5C@Dxjk=1j~m)@ceCCDJA`QL0)?I$}&|q8uA7MTvQm
zfMLvd1+24a*>ICr;l#%iSfT6p?7nG+zRPw)+OB2!o+tOP8BNhN4K^bl9)jV!UA+fd
zW5_`p54gyem0DKCGO8dCmkG3U9aiI-0%%iCOOZUR9-e^8;b0%E7W{b|01(J$^Drxd
zh(&X}<M(ERu}?(hd+&2EPA-loKh@7u(v-z<p+jSXEU%1%#zP>+!TeDU0+L5-Pcha-
zNy~FTsADBo>dppaflpO1&+<A8%aTrPr&{EMqiw{Avi$i!V036e;Qa<WZMeb+`2$H0
z7%XT(HbaOrl90%V?jn0YD3GXPAy0YrJb+B3&%_m3O5_EpnY3iS$AvbGFlEmYAVirR
zu@d1CVTKh%nMioCU~(d4$vb>VWcx1j919=-`d6pNla>kX&KFW$cflJ~tz0XSdQLyI
zJrZfsi|jt`ej(EJqz?*RyQMsB%X6eYS5^vCwqWq~RD+x@hjOjgIu7mHkZAh>b(xd~
zkDqi{x(<!G_4;M&4UOlwXOm!ba&&V#RxeMcXX9o-UEV~FPJ`>|aC)MHy7jq&K~q(|
z5FIFlC{K5FBm5FuEfUj82eMB-0#tO7HBSAt))wr**~AZqqtR9HV|acxl6_@t)BL(3
zIwE*kRd+L*DB4$%*Q~4I?OHOt5j#;K@R7Kb1idyQ5g`}#)t!Gqz2=PDWF2~4xu0#i
Wim4hB^rnKOdgw}09J6P7it-nQlGkql
diff --git a/pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch b/pkg/lwip/patches/0002-Add-RIOT-Makefiles.patch
deleted file mode 100644
index d6e0000b72d9f96bc7d152fb5b40c34b9a10931d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3176
zcmbuBO>dhp7{~Aa6wjfDM1+8O3qk9YZf&(n?K(B>X__hnre!0*AZd5#ho6Cx-~?)`
zwQ@-8zyHbac_ZgVwgSvnNQm#-mV@VpHFK;vu|wUl1FD;thM`I3jvK*Mmco+efM=lV
zUi|_?*D*S0HXdA&VjZUxE@>LlqJ&Q?5+{pQv#Tb}?v!pmqf@e`9^5`|CV&n2o;@)e
zYy-AE%k)ePijH+1EjRve8mv9|`QzmF>o+ho;}@KSA>3SC-?DG}L!&sMB|@sIqU~oG
zSTA6hp!6>UWf5p3kG0ly-{b|LzTGH;te`{E9%Y<ASv~T8r6W|PbR9=Ms_HlMo{cik
z^B(n(GS3oHlx4EJvQxTHM;wAjl0MLI0+t1FT2hwxEG<XM7(q}_mRwk6AqAF1hbh{a
z_8#sBeo(~4{B0E%Z=rM-@Ifgbae=HGZVBl@yb%iHC<0Y|h}S@NY4EpiQA(fdOmxGH
zV%By4SYy^}It~5E*WFpw9H52tNlQ0Lf>`}S$7rztRiEgf;0f!F#R4gDl+wR2njDQ-
zs@JrD<T=joS!=MJyXD!{_37Q^*?2rgN>y&B7dJ~#j@$M@3TyH>8gi*pD72|W0-q|s
zQa)Ox6q`BHW{$wDE)=0#t&(xNXSF2frZJ_!u`M)tL#@5Cb!M4OgJi>c`)E{6;V&o4
zv+=err#>kuU%mV7&5Cb-ORAb(%ePF!?5*Yl!%kH<Mcq^_c*omnM#{TTxFPh)!tF`H
z81st78ie5;MKn#rydQ^~mR%<9Knlz^$&A?aZ7|+eMAvlihv;?#evfW<AVo(FhuSz2
z(sgVl=-5bk7ajjhdL`pGrKo)0bwYQTYR^(c^g7!<fYg0{a#-C1IkeEghU*R{tU=>!
wrSPh;{GqH>U)j#q?esigJy1wNJG!ak8J2)P^cT^$H{{^i9}i?qXHyHI|0OW2wEzGB
--
GitLab