From 97271322c01c813cf3c3c4a1834637a2d59975ba Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 2 Nov 2017 16:01:01 -0500
Subject: 1.5.6 driver for mLinux 3

---
 recipes-kernel/rs9113/rs9113-from-src_1.5.0.bb | 62 -----------------------
 recipes-kernel/rs9113/rs9113-from-src_1.5.6.bb | 69 ++++++++++++++++++++++++++
 recipes-kernel/rs9113/rs9113_1.5.0.bb          | 27 ----------
 recipes-kernel/rs9113/rs9113_1.5.6.bb          | 27 ++++++++++
 4 files changed, 96 insertions(+), 89 deletions(-)
 delete mode 100644 recipes-kernel/rs9113/rs9113-from-src_1.5.0.bb
 create mode 100644 recipes-kernel/rs9113/rs9113-from-src_1.5.6.bb
 delete mode 100644 recipes-kernel/rs9113/rs9113_1.5.0.bb
 create mode 100644 recipes-kernel/rs9113/rs9113_1.5.6.bb

diff --git a/recipes-kernel/rs9113/rs9113-from-src_1.5.0.bb b/recipes-kernel/rs9113/rs9113-from-src_1.5.0.bb
deleted file mode 100644
index 234d6c9..0000000
--- a/recipes-kernel/rs9113/rs9113-from-src_1.5.0.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-DESCRIPTION = "USB Driver for Redpine RS9113"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-PACKAGE_ARCH = "mtcdt"
-PROVIDES = "rs9113-from-src"
-PR = "${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
-inherit module
-
-SRCREV = "${AUTOREV}"
-
-SRC_URI = " \
-        git://git@${MTS_INTERNAL_GIT}/mlinux/meta-rs9113.git;protocol=ssh;branch=${PV};destsuffix=meta/ \
-        git://git@${MTS_INTERNAL_GIT}/mlinux/Redpine.git;protocol=ssh;branch=${PV} \
-"
-SRCXX_URI = " \
-    git://git@${MTS_INTERNAL_GIT}/mlinux/Redpine.git;protocol=ssh;branch=${PV};name=machine \
-    git://git@${MTS_INTERNAL_GIT}/mlinux/meta-rs9113.git;protocol=ssh;branch=${PV};name=meta \
-"
-
-S = "${WORKDIR}/git/source/host"
-M = "${WORKDIR}/meta"
-
-EXTRA_OEMAKE = " KERNELDIR=${STAGING_KERNEL_DIR} \
-                 CROSS_COMPILE=${TARGET_PREFIX} \
-                 ARCH=arm \
-                 WLAN_COMPILE_FLAGS='' \
-		 V=1 \
-                "
-                
-FILES_${PN} = "/opt/rs9113 ${sbindir}"
-FILES_${PN}-dbg = "/opt/rs9113/.debug/"
-
-PARALLEL_MAKE = ""
-
-do_configure() {
-   cp ${M}/mtcdt/defconfig .config
-}
-
-do_compile () {
-   unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-   oe_runmake
-}
-
-do_patch () {
-	cd ${WORKDIR}/git
-	echo "patches" ${M}/patches/*
-	for f in ${M}/patches/* ; do
-		echo "Patching with ${f}"
-		patch -p1 < ${f}
-	done
-}
-
-do_install() {
-   install -m 0755 -d ${D}/opt/rs9113
-   cp -r ${S}/release/* ${D}/opt/rs9113/
-   rm -rf ${D}/opt/rs9113/flash ${D}/opt/rs9113/certs ${D}/opt/rs9113/*zigb*
-   install -m 0755 -d ${D}${sbindir}
-   install -m 0755 ${M}/rs9113_load_modules.sh ${D}${sbindir}/
-   install -m 0755 ${M}/rs9113_remove_modules.sh ${D}${sbindir}/
-}
-
diff --git a/recipes-kernel/rs9113/rs9113-from-src_1.5.6.bb b/recipes-kernel/rs9113/rs9113-from-src_1.5.6.bb
new file mode 100644
index 0000000..c490ae1
--- /dev/null
+++ b/recipes-kernel/rs9113/rs9113-from-src_1.5.6.bb
@@ -0,0 +1,69 @@
+DESCRIPTION = "USB Driver for Redpine RS9113"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+PACKAGE_ARCH = "mtcdt"
+PROVIDES = "rs9113-from-src"
+PR = "${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+
+inherit module
+
+SRCREV = "${AUTOREV}"
+
+SRC_URI = " \
+        git://git@${MTS_INTERNAL_GIT}/mlinux/meta-rs9113.git;protocol=ssh;branch=${PV};destsuffix=meta/ \
+        git://git@${MTS_INTERNAL_GIT}/mlinux/Redpine.git;protocol=ssh;branch=${PV} \
+"
+SRCXX_URI = " \
+    git://git@${MTS_INTERNAL_GIT}/mlinux/Redpine.git;protocol=ssh;branch=${PV};name=machine \
+    git://git@${MTS_INTERNAL_GIT}/mlinux/meta-rs9113.git;protocol=ssh;branch=${PV};name=meta \
+"
+
+S = "${WORKDIR}/git/source/host"
+M = "${WORKDIR}/meta"
+
+EXTRA_OEMAKE = " KERNELDIR=${STAGING_KERNEL_DIR} \
+                 CROSS_COMPILE=${TARGET_PREFIX} \
+                 ARCH=arm \
+                 WLAN_COMPILE_FLAGS='' \
+		 V=1 \
+                "
+                
+FILES_${PN} = "/opt/rs9113 ${sbindir}"
+FILES_${PN}-dbg = "/opt/rs9113/.debug/"
+
+PARALLEL_MAKE = ""
+
+do_configure() {
+   cp ${M}/mtcdt/defconfig .config
+}
+
+do_compile () {
+   unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+   oe_runmake
+}
+
+do_patch () {
+	cd ${WORKDIR}/git
+	for f in ${M}/patches/* ; do
+          # Cannot use [[ $f =~ \.patch$ ]] here because the $ after patch breaks the recipe.
+          if echo ${f} | grep '\.patch$' >/dev/null 2>&1 ; then
+            echo found patch ${f}
+            patch -Np1 < ${f}
+          else
+            fname=$(basename ${f})
+            oldf=$(find . -name ${fname})
+            echo "copying $f to ${oldf}"
+            cp ${f} ${oldf}
+          fi
+	done
+}
+
+do_install() {
+   install -m 0755 -d ${D}/opt/rs9113
+   cp -r ${S}/release/* ${D}/opt/rs9113/
+   rm -rf ${D}/opt/rs9113/flash ${D}/opt/rs9113/certs ${D}/opt/rs9113/*zigb*
+   install -m 0755 -d ${D}${sbindir}
+   install -m 0755 ${M}/rs9113_load_modules.sh ${D}${sbindir}/
+   install -m 0755 ${M}/rs9113_remove_modules.sh ${D}${sbindir}/
+}
+
diff --git a/recipes-kernel/rs9113/rs9113_1.5.0.bb b/recipes-kernel/rs9113/rs9113_1.5.0.bb
deleted file mode 100644
index fbfb706..0000000
--- a/recipes-kernel/rs9113/rs9113_1.5.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-require rs9113.inc
-DESCRIPTION = "USB Driver for Redpine RS9113"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-PACKAGE_ARCH = "mtcdt"
-PROVIDES = "rs9113"
-FILES_${PN} = "/opt/rs9113 ${sbindir} ${sysconfdir}"
-
-# This bitbake recipe requires SSH_AUTH_SOCK to be set if ssh key pass
-# phrases are used.  SSH_AUTH_SOCK is set by a keyserver,
-# such as gnome-keyring-daemon or ssh-keyagent.
-
-# NOTE: rs9113 binary is built with Jenkin's job using rs9113-from-src_${PV}.bb
-# To update this, manually copy ipk from Jenkin's job to
-#     git://git@${MTS_INTERNAL_GIT}/mlinux/ipk.git;protocol=ssh;branch=${PV}
-#
-PR = "r0.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-SRC_URI = " \
-    file://rs9113/rs9113.init \
-    file://rs9113/rs9113.default \
-    file://rs9113/wpa_supplicant \
-    file://rs9113-ipk/rs9113-from-src_${PV}-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}.0_mtcdt.ipk \
-"
-SRCREV = "${AUTOREV}"
-# For some reason the md5sum and sha256sum are ignored
-SRC_URI[md5sum] = "def9fd10a77cae9df9bcb2e20626795e"
-SRC_URI[sha256sum] = "367e942618143d4967273ce44120098a98e2ad1f543a9a404af7082b40c5066e"
diff --git a/recipes-kernel/rs9113/rs9113_1.5.6.bb b/recipes-kernel/rs9113/rs9113_1.5.6.bb
new file mode 100644
index 0000000..fbfb706
--- /dev/null
+++ b/recipes-kernel/rs9113/rs9113_1.5.6.bb
@@ -0,0 +1,27 @@
+require rs9113.inc
+DESCRIPTION = "USB Driver for Redpine RS9113"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+PACKAGE_ARCH = "mtcdt"
+PROVIDES = "rs9113"
+FILES_${PN} = "/opt/rs9113 ${sbindir} ${sysconfdir}"
+
+# This bitbake recipe requires SSH_AUTH_SOCK to be set if ssh key pass
+# phrases are used.  SSH_AUTH_SOCK is set by a keyserver,
+# such as gnome-keyring-daemon or ssh-keyagent.
+
+# NOTE: rs9113 binary is built with Jenkin's job using rs9113-from-src_${PV}.bb
+# To update this, manually copy ipk from Jenkin's job to
+#     git://git@${MTS_INTERNAL_GIT}/mlinux/ipk.git;protocol=ssh;branch=${PV}
+#
+PR = "r0.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+SRC_URI = " \
+    file://rs9113/rs9113.init \
+    file://rs9113/rs9113.default \
+    file://rs9113/wpa_supplicant \
+    file://rs9113-ipk/rs9113-from-src_${PV}-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}.0_mtcdt.ipk \
+"
+SRCREV = "${AUTOREV}"
+# For some reason the md5sum and sha256sum are ignored
+SRC_URI[md5sum] = "def9fd10a77cae9df9bcb2e20626795e"
+SRC_URI[sha256sum] = "367e942618143d4967273ce44120098a98e2ad1f543a9a404af7082b40c5066e"
-- 
cgit v1.2.3