From b071c5d47e106eea149bfe9492d842e5d8ced76c Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 14 Jul 2020 11:50:36 -0500
Subject: rs9113 kernel module version/revision to match other kernel modules

---
 recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb | 2 +-
 recipes-kernel/rs9113/rs9113.inc               | 2 +-
 recipes-kernel/rs9113/rs9113_1.6.1.bb          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'recipes-kernel/rs9113')

diff --git a/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb b/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb
index b6ed885..2022d88 100644
--- a/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb
+++ b/recipes-kernel/rs9113/rs9113-from-src_1.6.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "USB Driver for Redpine RS9113"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28"
 PROVIDES = "rs9113-from-src"
-PR = "r10.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "r10${KERNEL_MODULE_PACKAGE_SUFFIX}"
 INHIBIT_PACKAGE_STRIP = "1"
 BB_STRICT_CHECKSUM = "0"
 inherit module
diff --git a/recipes-kernel/rs9113/rs9113.inc b/recipes-kernel/rs9113/rs9113.inc
index 9986cd3..cf020ef 100644
--- a/recipes-kernel/rs9113/rs9113.inc
+++ b/recipes-kernel/rs9113/rs9113.inc
@@ -1,4 +1,5 @@
 inherit update-rc.d
+inherit module
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # utils-extra picks up ELF executables we don't want on most images.
@@ -79,7 +80,6 @@ python do_fetch_prepend () {
     gitversion = d.getVar("PV",True)
 
     PV = gitversion
-    PV += "-"
     try:
       PV += d.getVar("PR",True)
     except TypeError:
diff --git a/recipes-kernel/rs9113/rs9113_1.6.1.bb b/recipes-kernel/rs9113/rs9113_1.6.1.bb
index b00b581..7bf5f9c 100644
--- a/recipes-kernel/rs9113/rs9113_1.6.1.bb
+++ b/recipes-kernel/rs9113/rs9113_1.6.1.bb
@@ -16,7 +16,7 @@ RDEPENDS_${PN}-rm += "bash"
 # To update this, manually copy ipk from Jenkin's job to
 #     git://git@${MTS_INTERNAL_GIT}/mlinux/ipk.git;protocol=ssh;branch=${PV}
 #
-PR = "r10.${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "r10${KERNEL_MODULE_PACKAGE_SUFFIX}"
 SRC_URI = " \
     file://rs9113/rs9113.init \
     file://rs9113/rs9113.default \
-- 
cgit v1.2.3