From 412f1b1e555368b4cd158029713371b30df17fd4 Mon Sep 17 00:00:00 2001
From: Isaac Hermida <isaac.hermida@digi.com>
Date: Fri, 9 Sep 2016 12:02:36 +0200
Subject: [PATCH] meta-digi: rename external ethernet references to second
 ethernet

The name "ext-eth" seems to indicate "External Ethernet". Rename that variable
and related ones to a more proper name like second ethernet.

Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
---
 meta-digi-arm/conf/machine/include/ccardimx28.inc    |  6 +++---
 meta-digi-arm/conf/machine/include/digi-defaults.inc | 12 ++++++------
 meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb |  2 +-
 .../init-ifupdown/init-ifupdown_1.0.bbappend         |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc
index e9a6af2fe..115fb2a86 100644
--- a/meta-digi-arm/conf/machine/include/ccardimx28.inc
+++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc
@@ -40,8 +40,8 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}"
 # web1          Y       Y       Y       Y
 
 # Per-variant machine features
-MACHINE_FEATURES_append_e = " ext-eth"
+MACHINE_FEATURES_append_e = " second-eth"
 MACHINE_FEATURES_append_w = " wifi"
 MACHINE_FEATURES_append_wb = " wifi bluetooth"
-MACHINE_FEATURES_append_web = " wifi ext-eth bluetooth"
-MACHINE_FEATURES_append_web1 = " wifi ext-eth bluetooth 1-wire"
+MACHINE_FEATURES_append_web = " wifi second-eth bluetooth"
+MACHINE_FEATURES_append_web1 = " wifi second-eth bluetooth 1-wire"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index fd77702be..5fbfd1764 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -16,12 +16,12 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 #
 
 # Help variables used in recipes
-HAVE_WIFI    = "${@bb.utils.contains('MACHINE_FEATURES', 'wifi', '1', '', d)}"
-HAVE_EXT_ETH = "${@bb.utils.contains('MACHINE_FEATURES', 'ext-eth', '1', '', d)}"
-HAVE_BT      = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', '1', '', d)}"
-HAVE_1WIRE   = "${@bb.utils.contains('MACHINE_FEATURES', '1-wire', '1', '', d)}"
-HAVE_GUI     = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '1', '', d)}"
-HAVE_EXAMPLE = "${@bb.utils.contains('IMAGE_FEATURES', 'dey-examples', '1', '', d)}"
+HAVE_WIFI       = "${@bb.utils.contains('MACHINE_FEATURES', 'wifi', '1', '', d)}"
+HAVE_SECOND_ETH = "${@bb.utils.contains('MACHINE_FEATURES', 'second-eth', '1', '', d)}"
+HAVE_BT         = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', '1', '', d)}"
+HAVE_1WIRE      = "${@bb.utils.contains('MACHINE_FEATURES', '1-wire', '1', '', d)}"
+HAVE_GUI        = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '1', '', d)}"
+HAVE_EXAMPLE    = "${@bb.utils.contains('IMAGE_FEATURES', 'dey-examples', '1', '', d)}"
 
 #
 # Ethernet configuration used in recipes
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
index bc82533ed..6d7e0ec69 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb
@@ -22,7 +22,7 @@ do_update_dts() {
 	else
 		config_dts disable '_ssp2_mmc_wifi.dtsi'
 	fi
-	if [ -n "${HAVE_EXT_ETH}" ]; then
+	if [ -n "${HAVE_SECOND_ETH}" ]; then
 		config_dts enable  '_ethernet1.dtsi'
 	else
 		config_dts disable '_ethernet1.dtsi'
diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index 35acc7e94..06cd4c152 100644
--- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -25,7 +25,7 @@ do_install_append() {
 
 	# Create 'interfaces' file dynamically
 	cat ${WORKDIR}/interfaces.eth0.${ETH0_MODE} >> ${D}${sysconfdir}/network/interfaces
-	[ -n "${HAVE_EXT_ETH}" ] && cat ${WORKDIR}/interfaces.eth1.${ETH1_MODE} >> ${D}${sysconfdir}/network/interfaces
+	[ -n "${HAVE_SECOND_ETH}" ] && cat ${WORKDIR}/interfaces.eth1.${ETH1_MODE} >> ${D}${sysconfdir}/network/interfaces
 	[ -n "${HAVE_WIFI}" ] && cat ${WORKDIR}/interfaces.wlan0.${WLAN0_MODE} >> ${D}${sysconfdir}/network/interfaces
 	cat ${WORKDIR}/interfaces.br0.example >> ${D}${sysconfdir}/network/interfaces