From a61b878ee0ac0b31f93de68db2b1b6ff489e1b6e Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Thu, 26 Dec 2019 16:45:41 +0100
Subject: [PATCH] networkmanager-conf: Setup DHCP for nrhw20

Custom config for HW20 with DHCP on the 4 lans of the switch instead
of 4 different static subnets.

BugzID: 60765
---
 .../networkmanager/networkmanager-conf.bb         |   9 +++++++--
 .../am335x-nrhw20/system-connections-dhcp.tar.gz  | Bin 0 -> 653 bytes
 .../system-connections-static.tar.gz              | Bin 0 -> 681 bytes
 .../am335x-nrhw20/system-connections.tar.gz       | Bin 663 -> 0 bytes
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections-dhcp.tar.gz
 create mode 100644 recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections-static.tar.gz
 delete mode 100644 recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections.tar.gz

diff --git a/recipes-connectivity/networkmanager/networkmanager-conf.bb b/recipes-connectivity/networkmanager/networkmanager-conf.bb
index 6453e49..80b879b 100644
--- a/recipes-connectivity/networkmanager/networkmanager-conf.bb
+++ b/recipes-connectivity/networkmanager/networkmanager-conf.bb
@@ -20,7 +20,8 @@ SRC_URI = " \
 "
 
 SRC_URI_append_am335x-nrhw20 = " \
-                file://system-connections.tar.gz \
+                file://system-connections-static.tar.gz \
+                file://system-connections-dhcp.tar.gz \
 "
 
 do_install () {
@@ -44,7 +45,11 @@ do_install () {
 
 do_install_append_am335x-nrhw20() {
     rm -rf ${D}${sysconfdir}/NetworkManager/system-connections/*
-    install -m 0600 ${WORKDIR}/system-connections/* ${D}${sysconfdir}/NetworkManager/system-connections/ 
+    if ${@bb.utils.contains('PACKAGECONFIG','ethernet-dhcp','true','false',d)}; then
+        install -m 0600 ${WORKDIR}/system-connections-dhcp/* ${D}${sysconfdir}/NetworkManager/system-connections/
+    else
+        install -m 0600 ${WORKDIR}/system-connections-static/* ${D}${sysconfdir}/NetworkManager/system-connections/
+    fi
 }
 
 do_install_append_armada-385-nrhw18() {
diff --git a/recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections-dhcp.tar.gz b/recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections-dhcp.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..ddcab5b127045cb8a8edba8ffff99655970b19fd
GIT binary patch
literal 653
zcmV;80&@KyiwFQ;(F9%q1MQbfZrd;rK(*Gk7w`oJ9sZ?-7G3lL-KJjfr$&e+8KRuR
zyWFprDpe&7;`&nrs#73*3!9Qf4&mV&QehuP--7MC&fBr+y8!OiZa-!Vf)OP|_7K}&
zK0N%GzrTLMXEMSVQBo?VFhe34mDx%xIf+y3!l;MUDl>X;=bm$YtDA1M3w{XKnAepE
zC-T419a}2KlwcWi{E!{bKSvhxFOd*|B(4)A3I)qnxYPvB@y_#q^PKs0-neSYd%oMn
zR!o8_t(QQ3DS!*5pg>vz*Qlwdf^ly0aliGIA8-B8`7v+0(GRt@9y;Cnd91A;+9rf)
zWmWmuv_Agd?Y1I<3eHriM4sO~4Y1BzZ9zLX_z=Ksw7uIjVXWdK&Gw$Ja~GFq@OrSf
zRo=#4y{q(Y?C0O*I-k12H{U_qJ72{}X5(QyH22!>Pj-Im6uc>C{9jDJSNV_0|7&o>
zf1Ld{g=U`C3X~}waH47`r<OIy6ysDO;TQeK)BY=2@PaFv{C`VM`TzMbB}>G(<UdpN
zrT;YEB+374aOnS2-sc)1N>UrnB(ORj1ehl!7!g0XLgt8YMM2d;4VaXA9CI?SADVGr
zL0OiE)gku4=zCm#LuH18LJ@o%!|9>%)5S*Ld-xT`#Jex5h!i}QCj6@^@?GC~=sSpY
zslxZI{cq0f|8%Js7yTFVkNsaJ|F6Q4{h!Y6TS>6s)PW$@0H;X67(;-G(%YI*63=ZH
z_ka3Q>$KJXZ=CU;EEVHb=l|sYRXE~5nf=!W3(5(BS_>WD|78KCs0ARQPE%UcXzPpq
nle6#t91Di2C?pbzL?V$$Boc{4B9TZW690;yrp_~m04M+eIonQE

literal 0
HcmV?d00001

diff --git a/recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections-static.tar.gz b/recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections-static.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..892bd66f2c1e1f0d5170d75da8a57512ecadfc37
GIT binary patch
literal 681
zcmV;a0#^MWiwFRQ(F9%q1MQd1a+@#^fH`yR3-|>#(dq}G1BV{^0==d=NJunH40sSu
z$G5y+U#g-clZor#Bqr`mtM6dT7-_Lr-!Ax_A6x@v*S4-4>aO+R2R+o~WwIC~AcaWo
z!}#l``=8VMx6kB>1Q|n_Ws*sf5DWvEti*Dc@G{%*bNkgQF}k;N=h?2&b-UVn*ZXr^
z*O~Ay=6|hQwoHsM!CA=heR4SeT+pZdXJh^)=OO=Oneg-c=lQ>S%KUX&+hWXmy4{8m
zN+MP1GN4Wg;6h5s301%~(bQ4FI5+9A+ql9FH?D8pkk;+s`bw7$THUy5t&QuO+WT>5
z6{&Y2oYj5p!iS-5T=?^wO@V?6&ZLqeO|KqTyG|Qjg0{AI-h)}|@^)SOp$Mncn>&7;
zK754*Dtduge!(yBlJeA!d)Vo|yeZNqtk&70(d|~Rr<vI_6TZ6^n$Ef+T!UFV*!1<C
zE_a8f>+R5`e>+nj!>s=c3HUDmdG!Ar9Ppn^{+nDgM=J@^C<`2A1!^3XhA_!El?3@w
z|H&);XC%+^T;NImWAy*cyzKv%hdi7f<Cy<U?)gu{A&mZ?gMI%Wvp&@Tp|CQXWx%R%
zBfuOgFe1EgNti`p^PI}P8Zf%@u;!>#*Vn_Y0HxG^bqF&^P&{nEzA*h<q3~;c=iql3
z6OKMB9GT#uG!gom!tq1jI_O#mb*Ui#sLyX@w*S**VjS)NRQ%chv*`ahIMDy;<bIhU
z$vL$kur$CaK`_Q3Fri#oF^Ytfqy3-GXnjhnXR*~U!>s?fOpJHk|BLAVIXK`yPX22{
za>@~*(n5#l|11Y3Dggwk)s*HHDXXLY<LjUQImsD0sVLA`6e5vGBoc{4B9TZW5{X12
Pk!Sn@ra?Q~04M+e_}^*_

literal 0
HcmV?d00001

diff --git a/recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager-conf/am335x-nrhw20/system-connections.tar.gz
deleted file mode 100644
index 626a237c0f70ac7f9d8c21ac79fc659ef3650242..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 663
zcmV;I0%-joiwFP{Z$DcA1MQc~Zlf?1hO_1=@&czl$5*^yIZsh_VS|~X28b}}C~rSb
zNmVtaO)pGFn(?;?gy4(v^BtS852J6P?7PmFW7BuxdbKnd(Ne}E<C><UVB+!mkri=H
zS}Dynu8<^hTCL^cGnru*Mmwz6D`$u5z5A-ZwN1C)1wVvK%<Dpg*ZFU3#}^&r5U`3F
zzm>m`>^Xn+n7_i9KQ20pH~7!<zj;pnHfyTl5Pr7X#WT{VP3aXdZzKq*HRQ+)2#c0^
zCb<wU8~0mZ`0>sUogcHN8~sq*(nDukKlQcsL)(OKc(RHt_&8i;hsMV*W7GQh=eOH}
zB$I+`qh*%eJoR>)wYCIXRf7)!+{Tvon<k7!yrtPbh}-P=6BT6G6{-A6T+uZXS=9vy
z-VWtmk+re6zA9SV?d)c1siv0j(|6GJl`rBP+{VLpXdZ02pKES+W1s!)r2Y)^{x56Z
z7yOr6CI2tMjQ=?K?{dpMt2Jn6DiEY=Fo(0!A=fcKjU>+ck011(W3KXC(zpDl<o~Cc
z@&Cs$fW^i*=Ren{{wv9N^8XT?`u`OER0E`;+6k_J*Ks4jJsEH^eh7`cB3b1*(<e3H
z;L5SjgHrv_jQawNF{jlbw!o-(eEf#O4eu3-u(1yw9*1%9>Wjjmq==;n*+&Y;FMIEy
z?;zHt0{>B;Kg<03&lVly?E25->-|3_|1ZJJ`p+i!OGTIqR)M6_fnZ4BoFm}U__F4V
zP~h41pS`2?cb0mdmilFw_n#IW<4gO0o&3K9Gyc=$zjc^1K?JpxHopI>9E_|bAhF6a
xme*L;XZ@#-zyAx&Iex1suv8Qhi9{liNF)-8L?V$$Boc`i{04z@h;0BU004c(VTJ$z