From 14cc4bacd774563beaac4a5fabc577c898721d4a Mon Sep 17 00:00:00 2001
From: Stefan Eichenberger <stefan.eichenberger@netmodule.com>
Date: Thu, 22 Feb 2018 15:55:42 +0100
Subject: [PATCH] networkmanager: add support for nrhw20

---
 .../am335x-nrhw20/system-connections.tar.gz   | Bin 0 -> 646 bytes
 ...ernet-2a2b6485-4d06-4b86-8051-751399c6881a |  19 ------------------
 .../networkmanager/support-dsa.patch          |  14 +++++++++++++
 .../networkmanager/system-connections.tar.gz  | Bin 0 -> 353 bytes
 .../networkmanager/networkmanager_1.4.4.bb    |   8 ++++----
 5 files changed, 18 insertions(+), 23 deletions(-)
 create mode 100644 recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20/system-connections.tar.gz
 delete mode 100644 recipes-connectivity/networkmanager/networkmanager/ethernet-2a2b6485-4d06-4b86-8051-751399c6881a
 create mode 100644 recipes-connectivity/networkmanager/networkmanager/support-dsa.patch
 create mode 100644 recipes-connectivity/networkmanager/networkmanager/system-connections.tar.gz

diff --git a/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager/am335x-nrhw20/system-connections.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..ea69609c059078fdc76c74800c000b97a5510134
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/recipes-connectivity/networkmanager/networkmanager/ethernet-2a2b6485-4d06-4b86-8051-751399c6881a b/recipes-connectivity/networkmanager/networkmanager/ethernet-2a2b6485-4d06-4b86-8051-751399c6881a
deleted file mode 100644
index 4320646..0000000
--- a/recipes-connectivity/networkmanager/networkmanager/ethernet-2a2b6485-4d06-4b86-8051-751399c6881a
+++ /dev/null
@@ -1,19 +0,0 @@
-[connection]
-id=ethernet
-uuid=2a2b6485-4d06-4b86-8051-751399c6881a
-type=ethernet
-permissions=
-secondaries=
-
-[ethernet]
-mac-address-blacklist=
-
-[ipv4]
-address1=192.168.1.1/24
-dns-search=
-method=manual
-
-[ipv6]
-addr-gen-mode=stable-privacy
-dns-search=
-method=auto
diff --git a/recipes-connectivity/networkmanager/networkmanager/support-dsa.patch b/recipes-connectivity/networkmanager/networkmanager/support-dsa.patch
new file mode 100644
index 0000000..ccafa11
--- /dev/null
+++ b/recipes-connectivity/networkmanager/networkmanager/support-dsa.patch
@@ -0,0 +1,14 @@
+--- a/src/platform/nm-linux-platform.c  2018-02-21 11:51:49.400483978 +0100
++++ b/src/platform/nm-linux-platform.c	2018-02-21 11:52:27.621125455 +0100
+@@ -745,6 +745,11 @@
+ 			 * aside from the DEVTYPE. */
+ 			if (!g_strcmp0 (devtype, "gadget"))
+ 				return NM_LINK_TYPE_ETHERNET;
++
++			/* Distributed Switch Architecture switch chips */
++			if (!g_strcmp0 (devtype, "dsa"))
++				return NM_LINK_TYPE_ETHERNET;
++
+ 		}
+ 	}
+ 
diff --git a/recipes-connectivity/networkmanager/networkmanager/system-connections.tar.gz b/recipes-connectivity/networkmanager/networkmanager/system-connections.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8071ada19e08077616a3e1a081e143f35ac21ce1
GIT binary patch
literal 353
zcmV-n0iOOJiwFRli;h|V1MSj5Zo?oD1yHX!g)cw~1c<ZnNun&U86~JOj=-*z+m|${
zx@amzRhusQ-)4l(V5~p+lqVW^KgLM?6vmjJs-Gr`l`*BNrIGfnY9-#DUsZCc^wJ1p
zrL2UsM#-u+KYo)N<~+Gn*A<0+PqCx4qjYPZ9|sp=J!eY!5%+qK{5gM`_LL$`TshTQ
z-59RDuv~YI<&7|suZ&!-*S&2T>F)W)IbbWqm-%a9O8!ELG6H2%s#3MlRV{w|=g<Cm
z{+o~Fw=DSfJ$yFLWp&R4u<3N9kG><NA>@3Xq?TnW$9tCol?B_pZ`!iK_1t-%C}-Xs
zT>pFsc{*<i#}~b2*H^NYYqgNJS;&QaQkwagc_x?oeanV&+UVQC#n~M$o%YhncNF<B
zdTL9y-GTTqg%{VKZne948rffm000000000000000000000Psz(uyrwk04M+e<-M$t

literal 0
HcmV?d00001

diff --git a/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
index 0bbf46a..e7d7b61 100644
--- a/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
+++ b/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
@@ -1,4 +1,4 @@
-FILESEXTRAPAHT_prepend := "${THISDIR}/${MACHINE}"
+FILESEXTRAPAHT_prepend := "${THISDIR}/${PN}/${MACHINE}:"
 
 SUMMARY = "NetworkManager"
 SECTION = "net/misc"
@@ -10,13 +10,13 @@ DEPENDS = "libnl dbus dbus-glib libgudev wireless-tools nss util-linux libndp li
 
 inherit gnome gettext systemd
 
-INITIAL_CONNECTION = "ethernet-2a2b6485-4d06-4b86-8051-751399c6881a"
 
 SRC_URI = " \
     ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
     file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
-    file://${INITIAL_CONNECTION} \
+    file://system-connections.tar.gz \
     file://NetworkManager.conf \
+    file://support-dsa.patch \
 "
 SRC_URI[md5sum] = "63f1e0d6d7e9099499d062c84c927a75"
 SRC_URI[sha256sum] = "829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309"
@@ -95,7 +95,7 @@ SYSTEMD_SERVICE_${PN} = "NetworkManager.service"
 do_install_append() {
     rm -rf ${D}/run ${D}${localstatedir}/run
     mkdir -p ${D}${sysconfdir}/NetworkManager/system-connections
-    install -m 0600 ${WORKDIR}/${INITIAL_CONNECTION} ${D}${sysconfdir}/NetworkManager/system-connections/
+    install -m 0600 ${WORKDIR}/system-connections/* ${D}${sysconfdir}/NetworkManager/system-connections/
 
     install -m 0600 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
 }