From cbd128ea60a1d8d348a640235af90a6e3d7232e4 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 20 Apr 2018 16:27:27 -0500
Subject: Change get-eeprom-device-config to use new mts-io feature.

---
 .../get-eeprom-device-config.sh                    |  6 ++--
 .../multitech/get-eeprom-device-config_1.2.0.bb    | 32 ----------------------
 .../multitech/get-eeprom-device-config_1.2.1.bb    | 32 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 36 deletions(-)
 delete mode 100644 recipes-bsp/multitech/get-eeprom-device-config_1.2.0.bb
 create mode 100644 recipes-bsp/multitech/get-eeprom-device-config_1.2.1.bb

diff --git a/recipes-bsp/multitech/get-eeprom-device-config/get-eeprom-device-config.sh b/recipes-bsp/multitech/get-eeprom-device-config/get-eeprom-device-config.sh
index b6d9e5f..ab47d31 100755
--- a/recipes-bsp/multitech/get-eeprom-device-config/get-eeprom-device-config.sh
+++ b/recipes-bsp/multitech/get-eeprom-device-config/get-eeprom-device-config.sh
@@ -195,10 +195,8 @@ fi
 
 done <${CONFIG_PATH}/device_info
 
-PRODUCTID=$(cat /sys/devices/platform/mts-io/product-id)                               
-# No modem if first hyphen in product-ID is followed by                 
-# a numeric.  Modems always start with an alpha.                        
-if ((${#PRODUCTID})) && [[ $PRODUCTID =~ ^[^-]+-[^0-9] ]] ; then
+HASRADIO=$(cat /sys/devices/platform/mts-io/has-radio)                               
+if ((HASRADIO == 1)) ; then
   echo "Finding cellular module..."
   for ((i=0; i < TRY_COUNT; i++))
     do
diff --git a/recipes-bsp/multitech/get-eeprom-device-config_1.2.0.bb b/recipes-bsp/multitech/get-eeprom-device-config_1.2.0.bb
deleted file mode 100644
index c2330c3..0000000
--- a/recipes-bsp/multitech/get-eeprom-device-config_1.2.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-# Script to copy the EEPROM to /run/config and
-# init script to populate /run/config
-inherit update-rc.d
-PR = "r1"
-DESCRIPTION = "EEPROM copyting tool"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
-RDEPENDS_${PN} =+ "bash"
-
-SRCREV = "${PV}"
-
-SRC_URI = "file://${PN}.sh \
-           file://init"
-
-PARALLEL_MAKE = ""
-
-
-fakeroot do_install_append() {
-    # install MTCAP mts-io init script
-    install -d 0755 ${D}${base_sbindir}
-    install -d 0755 ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/${PN}.sh  ${D}${base_sbindir}/${PN}
-    install -m 0755 ${WORKDIR}/init  ${D}${sysconfdir}/init.d/eeprom-config
-}
-
-
-INITSCRIPT_NAME = "eeprom-config"
-# Must start after MTS-IO to read the accessory cards.
-INITSCRIPT_PARAMS = "start 40 S ."
diff --git a/recipes-bsp/multitech/get-eeprom-device-config_1.2.1.bb b/recipes-bsp/multitech/get-eeprom-device-config_1.2.1.bb
new file mode 100644
index 0000000..c2330c3
--- /dev/null
+++ b/recipes-bsp/multitech/get-eeprom-device-config_1.2.1.bb
@@ -0,0 +1,32 @@
+# Script to copy the EEPROM to /run/config and
+# init script to populate /run/config
+inherit update-rc.d
+PR = "r1"
+DESCRIPTION = "EEPROM copyting tool"
+HOMEPAGE = "http://www.multitech.net/"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
+RDEPENDS_${PN} =+ "bash"
+
+SRCREV = "${PV}"
+
+SRC_URI = "file://${PN}.sh \
+           file://init"
+
+PARALLEL_MAKE = ""
+
+
+fakeroot do_install_append() {
+    # install MTCAP mts-io init script
+    install -d 0755 ${D}${base_sbindir}
+    install -d 0755 ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/${PN}.sh  ${D}${base_sbindir}/${PN}
+    install -m 0755 ${WORKDIR}/init  ${D}${sysconfdir}/init.d/eeprom-config
+}
+
+
+INITSCRIPT_NAME = "eeprom-config"
+# Must start after MTS-IO to read the accessory cards.
+INITSCRIPT_PARAMS = "start 40 S ."
-- 
cgit v1.2.3