From 21dfcc9448986c00d4f7ea1b5edcbd86a7c3346f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de>
Date: Tue, 7 Nov 2017 18:21:14 +0100
Subject: [PATCH] pkg: change conflicting module name for pkg root directory

Root directory of libfixmath and u8g2 where the same as another directory.
---
 .../patches/0001-Move-to-RIOT-Makefiles.patch | Bin 4972 -> 4972 bytes
 .../patches/0002-Fix-warnings.patch           | Bin 4091 -> 4091 bytes
 .../0003-Adapt-unittests-for-RIOT.patch       | Bin 8506 -> 8506 bytes
 ...ng-module-name-for-pkg-root-director.patch | Bin 0 -> 594 bytes
 .../0001-u8g2-add-RIOT-makefiles.patch        | Bin 2065 -> 2063 bytes
 .../patches/0002-add-RIOT-interface.patch     | Bin 7554 -> 7554 bytes
 ...ng-module-name-for-pkg-root-director.patch | Bin 0 -> 589 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pkg/libfixmath/patches/0004-Change-conflicting-module-name-for-pkg-root-director.patch
 create mode 100644 pkg/u8g2/patches/0003-Change-conflicting-module-name-for-pkg-root-director.patch

diff --git a/pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch b/pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch
index 7075acd4a55f2a60b42faceb5227dad6a601a190..10462a23c6753adaf42c1bafc847ac55c9aba2a0 100644
GIT binary patch
delta 59
zcmaE(_C`(DttdZN!63~vDLE}ADcRCE#l#@l#5^U@+#og4EHN=9)i^CF)xy%y$RNqk
OV4`jlqshh%dxQX5W)r0V

delta 59
zcmaE(_C`(DttdZN!N5E*$t>9@Imt5BB+0-y$vD--&^XcD*x16<Ak8?<!qC#v(8Myu
OaH4J#qw&TKdxQWm(GoNO

diff --git a/pkg/libfixmath/patches/0002-Fix-warnings.patch b/pkg/libfixmath/patches/0002-Fix-warnings.patch
index b2f028273fa5b22c4b6fdf6015c5ebd1aa06c3a0..2de4009e10d8000b0b0aa60a485bc6607977ff5c 100644
GIT binary patch
delta 76
zcmew@|65+yttdZN!O$c%G11V%(A>l<**q=P)FjE&)Fja|CB@Pr*(llAJT1k<Fv&D2
gWuk5qqshh%57^i(Oij(rO;RQ|GD&XU!0ycf0H@d&!vFvP

delta 76
zcmew@|65+yttdZNAt}|!BrVz8(9qb_#4^Ps%{;{-$t*3=C?(Cv(jp}-#n>z@$uK3w
gWTI{pqw&TK57^j~4HHw6P0}VeGD&XU!0ycf0L2d&*#H0l

diff --git a/pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch b/pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch
index 329a8466aa1a4b12bcdfe1f02da5672ae67757fd..881f4456ea2ca4ec5651ee8c28a183aa38bf1275 100644
GIT binary patch
delta 59
zcmdnxw984?ttdZNAt}w$+$1f{$UH5@#3ISU(##|&Db>Wn(Ad<_Ffj$lOg1w&PPDX`
NsN2M7vT;L~0suAI5|aP`

delta 59
zcmdnxw984?ttdZN!Pvww)xs#v(kwaAC^^k6#V|QFB`MJ&#n{ZyAlcBsA}P_-(9}33
OWuk5qqw&TKT?zm;_7cee

diff --git a/pkg/libfixmath/patches/0004-Change-conflicting-module-name-for-pkg-root-director.patch b/pkg/libfixmath/patches/0004-Change-conflicting-module-name-for-pkg-root-director.patch
new file mode 100644
index 0000000000000000000000000000000000000000..67aed3aa8ab89f8c18a815311c419d010bd394ae
GIT binary patch
literal 594
zcmY*WQE%HI7<}hf+{2_M!getsab?YmyQFC+E!)&2PtzX2fWw+V>pD{>?Z=N~Qkx-!
z_zv#AJ6LpK4>{t32|1RHDj2s`@hc^@ELfu_JRYb*$fC$Kmce6X9+4MdtUOI{#&WWV
zG9{|%X1z$SrccvbS<Ob(^~YZNinBY}^`@Ivc;8ABp=^5sYI{hP>2}U%+I%2$*_#sU
zgGo@}OZXL)W1oCd3SRO8l;w<()j|C<O<&^sx9j!n4&qY$z-%jhYtRI5cdqH3Z?O;h
zuru&-Z(u`*$A=bO2tBmxB0qG$3Az8ThV&Xcr>uL~%YF+L;<A+*7jNLjxo$?%G$mNd
z2V-6A^#>f36683Q&B>HbBI^9J>3SFZ^MDQs(au_=Y3q8(%U8O3-4f@ud4ZaYjZot(
z<4wbb&JpuZggACR;}J?J&bW1rG*3pLc``;_6T195-+aD7b$o*KEeeTFo%QAkgXG;H
pI*vbd7C&N})y+Tda5yA5j`^qi6=-#KjllRACwc<mS&<1s{sJU5v5^1(

literal 0
HcmV?d00001

diff --git a/pkg/u8g2/patches/0001-u8g2-add-RIOT-makefiles.patch b/pkg/u8g2/patches/0001-u8g2-add-RIOT-makefiles.patch
index dc342cbd68fdc3cacb82f02ac81ba8a77488a8b3..6f81d3c212513499de80c6d232930b7cfc01db63 100644
GIT binary patch
delta 81
zcmbOz&@Z6tR+OKsV47@bW|5X`mSSm^Vv&+;VPa`uo@!=ho@j26WSnSWnq*;OU}R)&
kFj2Qd&^T71)FR!;N+B^NMIp%3KV;)^7j{;2Jrgc20IC2MIRF3v

delta 83
zcmeAdm?)s@R+OKsV3=x@Vq|P&Xl$CCWR#kmlx&ikXlQ0;kqE>|<|e5|CPqn##%U=N
lbvuNNViig)(v7SX5>rwXf;|006gD1nVP`Y6&@<xV0s!(N7gGQL

diff --git a/pkg/u8g2/patches/0002-add-RIOT-interface.patch b/pkg/u8g2/patches/0002-add-RIOT-interface.patch
index 0004a3a495c832666055f995f38d7a65e49cd58b..dcca03af4ce2d5818e26c9237222876be066aa78 100644
GIT binary patch
delta 118
zcmZp&ZnD;OE6UGRFiSMBOf^qRO*OPMF|#mCGcz`~Fic4?NK7+JHZ(O!GfFc_H8r$M
zo~YZwXuNTo0i%FfTAFd1rJ<f)ijjqhnW5$8Z;V2s0*NMxmX=B8dU~m*1{P*!CYvS1
W=do~_80(lRXj_^ZZr(3_m=OTj`XKQD

delta 118
zcmZp&ZnD;OE6UGRFflbUH#AB%OEfpJOf*U{H8f5(HZx01O0i6}Fa(OEnOUSJCMTs#
z)a_t2+PKYtQNYA3B{?<OSWho0+1$*;!eH|^Mj=rFqhw3tWD9eksEM(Og{ARk3GsO>
UoW_<qW(wMtCgz*>OCM$g0N&dnK>z>%

diff --git a/pkg/u8g2/patches/0003-Change-conflicting-module-name-for-pkg-root-director.patch b/pkg/u8g2/patches/0003-Change-conflicting-module-name-for-pkg-root-director.patch
new file mode 100644
index 0000000000000000000000000000000000000000..29af20dbaba93cb361d2348847dae201be7b1d46
GIT binary patch
literal 589
zcmY*VO>f#j6uj@R7^#P}GIqSSF<{k&6iQPmv{fLds)zlu*~aYB^%@l^KR(8Xh)VD9
zW~7<-X4cLgkWHp(C3v3a<9wzh%QMb7n}}?dq!o|TB<>Lx5*ur<RY%YX;<y+FNgPwM
z?rjQ`^QYZ9oX-Ewzp`?fmUo{$Gi4IrGv}3?m-tvS)l<=aAQn{@a^)IrBB?%+74xdV
zu2UmS@ZFwz=l%}Oi!m)IMG(_CCfknxQNkDa_497GyhnPQ{>F08OsycSsTwW3HZ=}b
zc8!8z2ZhQy9G`1AYdxfPz23SrA&>uIFe4#aC%~=WW6vaRx@n!<Tzf?%3`2qqdsdb1
z{a=tE2nZ+!D27MmsAsilmGjz~_I>by5UHyQVOVPqcKashZ!6J8s((--&nm{FD5EpQ
zB}bn*&$7$aD;)`f09V?@0wEox2<T{x#exKzAFHQ_FDNgu!%GO#|G4`0xJ6J783_p9
zVY_;OU<O>FYn23R!En;fcdY4)YL5*&kH9+*-3~1p=JiRzGgm7QYnt<=5RfFAL>VEk
Dp_;Gk

literal 0
HcmV?d00001

-- 
GitLab