From 3f51170eb5bda27d752d863b973819d3af6e820c Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Tue, 10 Jul 2018 11:02:59 +0200
Subject: [PATCH] nrhw20:fct: Add custom network configuration

The config for the fct image should use a different IP address
on each port of the switch instead of bridging
---
 .../am335x-nbhw16}/NetworkManager.conf            |   0
 .../am335x-nrhw20/system-connections.tar.gz       | Bin 0 -> 663 bytes
 .../networkmanager/networkmanager-fct_1.4.4.bb    |   6 ++++++
 .../am335x-nrhw20-fct/NetworkManager.conf         |   2 --
 .../am335x-nrhw20-fct/system-connections.tar.gz   | Bin 646 -> 0 bytes
 .../networkmanager/networkmanager_1.4.4.bb        |   2 --
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename recipes-connectivity/networkmanager/{networkmanager/am335x-nbhw16-fct => networkmanager-fct/am335x-nbhw16}/NetworkManager.conf (100%)
 create mode 100644 recipes-connectivity/networkmanager/networkmanager-fct/am335x-nrhw20/system-connections.tar.gz
 create mode 100644 recipes-connectivity/networkmanager/networkmanager-fct_1.4.4.bb
 delete mode 100644 recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/NetworkManager.conf
 delete mode 100644 recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/system-connections.tar.gz

diff --git a/recipes-connectivity/networkmanager/networkmanager/am335x-nbhw16-fct/NetworkManager.conf b/recipes-connectivity/networkmanager/networkmanager-fct/am335x-nbhw16/NetworkManager.conf
similarity index 100%
rename from recipes-connectivity/networkmanager/networkmanager/am335x-nbhw16-fct/NetworkManager.conf
rename to recipes-connectivity/networkmanager/networkmanager-fct/am335x-nbhw16/NetworkManager.conf
diff --git a/recipes-connectivity/networkmanager/networkmanager-fct/am335x-nrhw20/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager-fct/am335x-nrhw20/system-connections.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..626a237c0f70ac7f9d8c21ac79fc659ef3650242
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/recipes-connectivity/networkmanager/networkmanager-fct_1.4.4.bb b/recipes-connectivity/networkmanager/networkmanager-fct_1.4.4.bb
new file mode 100644
index 0000000..9338812
--- /dev/null
+++ b/recipes-connectivity/networkmanager/networkmanager-fct_1.4.4.bb
@@ -0,0 +1,6 @@
+require recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_append := ":${THISDIR}/networkmanager"
+
+PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}"
diff --git a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/NetworkManager.conf b/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/NetworkManager.conf
deleted file mode 100644
index 0763348..0000000
--- a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[device]
-wifi.scan-rand-mac-address=no
diff --git a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20-fct/system-connections.tar.gz
deleted file mode 100644
index ea69609c059078fdc76c74800c000b97a5510134..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 646
zcmV;10(t!(iwFQw$xdAY1MQd1Zlf?1g<1P4@&dQDum51da-O2<!Zw!{H9!QUqrCl?
zkj_-;D5*xB(n>xHaDI#<4&OQPco-*YA@p5GVQTtryv;sZJj!Z)JV%|Mk7FS<O0Ccs
zm2n}J#B8IpPtbmx+_2eXL*GxAzIW~OZ>sUF|6A9I5BJ}^_5HX1QmW`bDyg~Ah|zx~
zEYCJP`TyT__s98r)>P$eKHKl($a$Wl5&~+c9Vl&bD0HoX3#=SsUh`11>9C`crbik&
znpo3KG}JB-bgrf4TCIx@*ihQs2bDVoA$Sf7l>=wB0;+S8CO99oVLKYyW*q0Iuw)~}
zpH{h{q4~wuJrf*P^FvcT5My^Q%ihN|0=TLgXdJ<BU3l6y<5aRN>0kI?Zt!RFZ^SA8
zC0G2&zm7GK_+Nql6J5syco(y;nLOj)5Bvhs?5^28t9y0=SCpc_8)5PraU*U~v8o$k
zBsYY|lC_cbzA9VS?cH{nX_lGrKpnJwMP>BSZwYoo^X$UmZ`0j=>QgAZr~h&N{uhb=
zmHHnS`hyWXS6G1-!AJVJ0Pnp3sS66VL=m(4YX4*E|8K|tkJEkqJpL`7?f<kuo%mma
z{}=O@4A6zBy^;oGP4PgY0I%agSuQJ~t2{@0mH~6go~}7}aX&QEp@gC+&eI{z;4kTL
z`JcjT_~W~5YFdh}wYySiqt(1w#P{UEPxnO7cMx-_<S894^uJuc|1t5uQvb_^{YaH9
zLc|`a&~g87E#w>{`;I##)KV#bwf|-6|L@2@U!8wr6aOpm&lmoE?j&Jt!TO?tn8-C0
g^C<EwtyE~EO;`EniT|Xeq@=H@U!UJK^Z*_J0F*^l1poj5

diff --git a/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
index 09b3c2a..cf2889d 100644
--- a/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
+++ b/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
@@ -1,5 +1,3 @@
-FILESEXTRAPAHT_prepend := "${THISDIR}/${PN}/${MACHINE}:"
-
 SUMMARY = "NetworkManager"
 SECTION = "net/misc"