From 1b68688574a37a7a4f41fb5688ae9e9fe87b5fa6 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 1 Feb 2023 16:37:59 -0600
Subject: Bump rs9113 version to 1.6.6

---
 recipes-kernel/rs9113/rs9113-from-src_1.6.5.bb | 92 --------------------------
 recipes-kernel/rs9113/rs9113-from-src_1.6.6.bb | 92 ++++++++++++++++++++++++++
 recipes-kernel/rs9113/rs9113_1.6.5.bb          | 38 -----------
 recipes-kernel/rs9113/rs9113_1.6.6.bb          | 38 +++++++++++
 4 files changed, 130 insertions(+), 130 deletions(-)
 delete mode 100644 recipes-kernel/rs9113/rs9113-from-src_1.6.5.bb
 create mode 100644 recipes-kernel/rs9113/rs9113-from-src_1.6.6.bb
 delete mode 100644 recipes-kernel/rs9113/rs9113_1.6.5.bb
 create mode 100644 recipes-kernel/rs9113/rs9113_1.6.6.bb

diff --git a/recipes-kernel/rs9113/rs9113-from-src_1.6.5.bb b/recipes-kernel/rs9113/rs9113-from-src_1.6.5.bb
deleted file mode 100644
index 1025444..0000000
--- a/recipes-kernel/rs9113/rs9113-from-src_1.6.5.bb
+++ /dev/null
@@ -1,92 +0,0 @@
-DESCRIPTION = "USB Driver for Redpine RS9113"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-PROVIDES = "rs9113-from-src"
-PR = "r18"
-PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
-INHIBIT_PACKAGE_STRIP = "1"
-BB_STRICT_CHECKSUM = "0"
-inherit module
-SRCREV = "${PV}"
-
-# AUTOREV breaks mLinux source tarballs in Thud
-# SRCREV = "${AUTOREV}"
-SRCREV_FORMAT = "machine"
-
-# Debugging can go into this file
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-
-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} \
-        file://debug-rs9113.patch \
-"
-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 = ""
-
-# Avoid QA Issue: No GNU_HASH in the elf binary
-INSANE_SKIP_${PN} = "ldflags"
-INSANE_SKIP_${PN}-dev = "ldflags" 
-
-do_configure() {
-   cp ${M}/${MACHINE}/defconfig .config
-}
-
-do_compile () {
-   unset CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
-   # For Newer Yocto/Bitbake, CC does not
-   # include the staging directory
-   # by default
-   CC="${CC} --sysroot=${STAGING_DIR_HOST}"
-   LD="${LD} --sysroot=${STAGING_DIR_HOST}"
-   oe_runmake CC="${CC}" LD="${LD}"
-}
-
-do_patch () {
-	cd ${WORKDIR}/git
-	for f in ${M}/patches/* ../*.patch ; 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() {
-   echo D is ${D}
-   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}/
-   # New patch makes p2commands.sh a bash script.
-   cd ${D}/opt/rs9113/
-   mv p2pcommands.pl p2pcommands.sh
-   ln -sf p2pcommands.sh p2pcommands.pl
-}
-
diff --git a/recipes-kernel/rs9113/rs9113-from-src_1.6.6.bb b/recipes-kernel/rs9113/rs9113-from-src_1.6.6.bb
new file mode 100644
index 0000000..1025444
--- /dev/null
+++ b/recipes-kernel/rs9113/rs9113-from-src_1.6.6.bb
@@ -0,0 +1,92 @@
+DESCRIPTION = "USB Driver for Redpine RS9113"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+PROVIDES = "rs9113-from-src"
+PR = "r18"
+PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
+INHIBIT_PACKAGE_STRIP = "1"
+BB_STRICT_CHECKSUM = "0"
+inherit module
+SRCREV = "${PV}"
+
+# AUTOREV breaks mLinux source tarballs in Thud
+# SRCREV = "${AUTOREV}"
+SRCREV_FORMAT = "machine"
+
+# Debugging can go into this file
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+
+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} \
+        file://debug-rs9113.patch \
+"
+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 = ""
+
+# Avoid QA Issue: No GNU_HASH in the elf binary
+INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP_${PN}-dev = "ldflags" 
+
+do_configure() {
+   cp ${M}/${MACHINE}/defconfig .config
+}
+
+do_compile () {
+   unset CFLAGS LDFLAGS CXXFLAGS CPPFLAGS
+   # For Newer Yocto/Bitbake, CC does not
+   # include the staging directory
+   # by default
+   CC="${CC} --sysroot=${STAGING_DIR_HOST}"
+   LD="${LD} --sysroot=${STAGING_DIR_HOST}"
+   oe_runmake CC="${CC}" LD="${LD}"
+}
+
+do_patch () {
+	cd ${WORKDIR}/git
+	for f in ${M}/patches/* ../*.patch ; 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() {
+   echo D is ${D}
+   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}/
+   # New patch makes p2commands.sh a bash script.
+   cd ${D}/opt/rs9113/
+   mv p2pcommands.pl p2pcommands.sh
+   ln -sf p2pcommands.sh p2pcommands.pl
+}
+
diff --git a/recipes-kernel/rs9113/rs9113_1.6.5.bb b/recipes-kernel/rs9113/rs9113_1.6.5.bb
deleted file mode 100644
index d2643d9..0000000
--- a/recipes-kernel/rs9113/rs9113_1.6.5.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-require rs9113.inc
-DESCRIPTION = "USB Driver for Redpine RS9113"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
-do_fetch[depends] += "virtual/kernel:do_shared_workdir"
-PROVIDES = "rs9113"
-FILES_${PN} = "/opt/rs9113 ${sbindir} ${sysconfdir}"
-RDEPENDS_${PN}-noarch += "bash"
-RDEPENDS_${PN}-rm += "bash"
-COMPATIBLE_MACHINE = "(mtcdt|mtrv1)"
-
-# 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 = "r18"
-PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
-SRC_URI = " \
-    file://rs9113/rs9113.init \
-    file://rs9113/rs9113.default \
-    file://rs9113/rs9113.reset \
-    file://rs9113/mts-rm-rs9113 \
-    file://rs9113/wpa_supplicant \
-    file://rs9113-ipk/rs9113-from-src_${PV}-${PKGR}.0_${MACHINE}.ipk;name=binaries \
-    file://rs9113/messages.patch;patchdir=${WORKDIR} \
-"
-SRCREV = "${PV}"
-
-# AUTOREV breaks mLinux source tarballs in Thud
-# SRCREV = "${AUTOREV}"
-
-# For some reason the md5sum and sha256sum are ignored
-SRC_URI[binaries.md5sum] = "7c0f7badf5a2a3b3dacc790ff0a9ce55"
-SRC_URI[binaries.sha256sum] = "2780d417295999724ada4a08e6a196aaca55324af24b404e0f9b2f2ea7d4d830"
diff --git a/recipes-kernel/rs9113/rs9113_1.6.6.bb b/recipes-kernel/rs9113/rs9113_1.6.6.bb
new file mode 100644
index 0000000..d2643d9
--- /dev/null
+++ b/recipes-kernel/rs9113/rs9113_1.6.6.bb
@@ -0,0 +1,38 @@
+require rs9113.inc
+DESCRIPTION = "USB Driver for Redpine RS9113"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
+do_fetch[depends] += "virtual/kernel:do_shared_workdir"
+PROVIDES = "rs9113"
+FILES_${PN} = "/opt/rs9113 ${sbindir} ${sysconfdir}"
+RDEPENDS_${PN}-noarch += "bash"
+RDEPENDS_${PN}-rm += "bash"
+COMPATIBLE_MACHINE = "(mtcdt|mtrv1)"
+
+# 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 = "r18"
+PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
+SRC_URI = " \
+    file://rs9113/rs9113.init \
+    file://rs9113/rs9113.default \
+    file://rs9113/rs9113.reset \
+    file://rs9113/mts-rm-rs9113 \
+    file://rs9113/wpa_supplicant \
+    file://rs9113-ipk/rs9113-from-src_${PV}-${PKGR}.0_${MACHINE}.ipk;name=binaries \
+    file://rs9113/messages.patch;patchdir=${WORKDIR} \
+"
+SRCREV = "${PV}"
+
+# AUTOREV breaks mLinux source tarballs in Thud
+# SRCREV = "${AUTOREV}"
+
+# For some reason the md5sum and sha256sum are ignored
+SRC_URI[binaries.md5sum] = "7c0f7badf5a2a3b3dacc790ff0a9ce55"
+SRC_URI[binaries.sha256sum] = "2780d417295999724ada4a08e6a196aaca55324af24b404e0f9b2f2ea7d4d830"
-- 
cgit v1.2.3