Merge branch 'master' into 'vs/feature-diff-upgrade'

# Conflicts:
#   recipes-kernel/linux/linux-at91_4.9.87.bb

19 files changed, 33 insertions, 29 deletions

diff --git a/recipes-bsp/multitech/mtac-eth_1.1.0.bb b/recipes-bsp/multitech/mtac-eth_1.1.0.bb
index b4f784b..f05fc19 100644
--- a/recipes-bsp/multitech/mtac-eth_1.1.0.bb
+++ b/recipes-bsp/multitech/mtac-eth_1.1.0.bb
@@ -11,7 +11,7 @@ INC_PR = "r0"
 
 SRCREV = "${PV}"
 
-PR = "${INC_PR}.1-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 SRC_URI = " \
     git://git.multitech.net/mtac-eth.git;protocol=git \
diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb b/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
index 5fbc34a..d00c5fa 100644
--- a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
+++ b/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
@@ -11,7 +11,7 @@ INC_PR = "r0"
 
 SRCREV = "${AUTOREV}"
 
-PR = "${INC_PR}.1-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 SRC_URI = " \
     git://git.multitech.net/mtac-gpiob.git;protocol=git \
diff --git a/recipes-bsp/multitech/mtac-lora_1.1.4.bb b/recipes-bsp/multitech/mtac-lora_1.1.4.bb
index c2a861f..ec4dd21 100644
--- a/recipes-bsp/multitech/mtac-lora_1.1.4.bb
+++ b/recipes-bsp/multitech/mtac-lora_1.1.4.bb
@@ -11,7 +11,7 @@ INC_PR = "r0"
 
 SRCREV = "${PV}"
 
-PR = "${INC_PR}.1-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 SRC_URI = " \
     git://git.multitech.net/mtac-lora.git;protocol=git \
diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.0.bb b/recipes-bsp/multitech/mtac-mfser_1.1.0.bb
index 070c2d5..42640f5 100644
--- a/recipes-bsp/multitech/mtac-mfser_1.1.0.bb
+++ b/recipes-bsp/multitech/mtac-mfser_1.1.0.bb
@@ -11,7 +11,7 @@ INC_PR = "r0"
 
 SRCREV = "${PV}"
 
-PR = "${INC_PR}.1-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 SRC_URI = " \
     git://git.multitech.net/mtac-mfser.git;protocol=git \
diff --git a/recipes-bsp/multitech/mtac-pulse_1.1.0.bb b/recipes-bsp/multitech/mtac-pulse_1.1.0.bb
index e7dd731..4b0195f 100644
--- a/recipes-bsp/multitech/mtac-pulse_1.1.0.bb
+++ b/recipes-bsp/multitech/mtac-pulse_1.1.0.bb
@@ -11,7 +11,7 @@ INC_PR = "r0"
 
 SRCREV = "${PV}"
 
-PR = "${INC_PR}.1-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 SRC_URI = " \
     git://git.multitech.net/mtac-pulse.git;protocol=git \
diff --git a/recipes-bsp/multitech/mtac-xdot_1.1.0.bb b/recipes-bsp/multitech/mtac-xdot_1.1.0.bb
index a0861a4..988a491 100644
--- a/recipes-bsp/multitech/mtac-xdot_1.1.0.bb
+++ b/recipes-bsp/multitech/mtac-xdot_1.1.0.bb
@@ -11,7 +11,7 @@ INC_PR = "r2"
 
 SRCREV = "${PV}"
 
-PR = "${INC_PR}.1-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 SRC_URI = " \
     git://git.multitech.net/mtac-xdot.git;protocol=git \
diff --git a/recipes-bsp/multitech/mtac_4.0.3.bb b/recipes-bsp/multitech/mtac_4.0.3.bb
index 7e452bc..376dfa1 100644
--- a/recipes-bsp/multitech/mtac_4.0.3.bb
+++ b/recipes-bsp/multitech/mtac_4.0.3.bb
@@ -14,7 +14,7 @@ SRCREV = "${AUTOREV}"
 # Some packages depend on mtac
 RPROVIDES_kernel-module-${PN} = "mtac"
 
-PR = "${INC_PR}.1-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 SRC_URI = " \
     git://git.multitech.net/mtac.git;protocol=git \
diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc
index 3360570..5b1dccc 100644
--- a/recipes-bsp/multitech/mts-io.inc
+++ b/recipes-bsp/multitech/mts-io.inc
@@ -11,6 +11,7 @@ INC_PR = "r1"
 
 SRCREV = "${PV}"
 
+PR = "${INC_PR}.1-${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 SRC_URI = " \
     git://git.multitech.net/mts-io.git;protocol=git \
diff --git a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch b/recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch
index 6c78c81..6c78c81 100644
--- a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-quectel_qmi_wwan_support.patch
+++ b/recipes-kernel/linux/linux-at91-4.9.87/0001-linux-4.9-quectel_qmi_wwan_support.patch
diff --git a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch b/recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch
index f3795b7..7ed5c9b 100644
--- a/recipes-kernel/linux/linux-at91-4.9.87/linux-4.9-telit_print_qmi_wwan.patch
+++ b/recipes-kernel/linux/linux-at91-4.9.87/0002-linux-4.9-telit_print_qmi_wwan.patch
@@ -11,8 +11,8 @@ index 156f7f85e4860d682d679df68bfe8cfe2a3d4b3b..2474618404f5e592c0fe56d38c30c898
 --- a/drivers/net/usb/qmi_wwan.c
 +++ b/drivers/net/usb/qmi_wwan.c
 @@ -908,7 +908,7 @@ static const struct usb_device_id products[] = {
- 	{QMI_FIXED_INTF(0x2357, 0x9000, 4)},	/* TP-LINK MA260 */
- 	{QMI_QUIRK_SET_DTR(0x1bc7, 0x1040, 2)},	/* Telit LE922A */
+	{QMI_FIXED_INTF(0x1bc7, 0x1100, 3)},	/* Telit ME910 */
+	{QMI_FIXED_INTF(0x1bc7, 0x1101, 3)},	/* Telit ME910 dual modem */
  	{QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},	/* Telit LE920 */
 -	{QMI_FIXED_INTF(0x1bc7, 0x1201, 2)},	/* Telit LE920 */
 +	{QMI_QUIRK_SET_DTR(0x1bc7, 0x1201, 2)},	/* Telit LE920, LE920A4 */
diff --git a/recipes-kernel/linux/linux-at91_4.9.87.bb b/recipes-kernel/linux/linux-at91_4.9.87.bb
index c6fbe36..4ae9f41 100644
--- a/recipes-kernel/linux/linux-at91_4.9.87.bb
+++ b/recipes-kernel/linux/linux-at91_4.9.87.bb
@@ -20,6 +20,7 @@ KERNEL_EXTRA_ARGS ="LOADADDR=0x20008000"
 
 PR = "r11"
 KERNEL_VERSION = "${PV}"
+KERNEL_REVISION = "${PR}"
 EXTRAVERSION = ""
 
 SAMV = "linux4sam_5.8"
@@ -42,13 +43,12 @@ COMMON_PATCHES = " \
                   file://linux-4.9-cdc-acm-ignore-exar-devices.patch \
 		  file://EXTRAVERSION.patch \
 		  file://linux-4.9-ledtrig-netdev.patch \
-		  file://linux-4.9-telit_print_qmi_wwan.patch \
 		  file://linux-4.9-addl-time-for-pmeccerrloc.patch \
 		  file://950-0090-OF-DT-Overlay-configfs-interface.patch \
 		  file://linux-4.9-led-core-Fix-brightness-setting-when-setting-delay_off-0.patch \
 		  file://linux-4.9-linux4sam-usb-serial-option.patch \
-		  file://linux-4.9-quectel_qmi_wwan_support.patch \
-		  file://make-kernel-reproducible.patch \
+		  file://0001-linux-4.9-quectel_qmi_wwan_support.patch \
+		  file://0002-linux-4.9-telit_print_qmi_wwan.patch \
 		 "
 
 
@@ -100,8 +100,11 @@ do_deploy_append() {
 	fi
 }
 
-# Kernel PR is used for MLINUX_KERNEL_EXTRA_VERSION; share it here:
+# Files needed to build external kernel modules.
 do_shared_workdir_append() {
+    install -d -m 755 ${STAGING_KERNEL_BUILDDIR}/include/config
+    cp -a ${B}/include/config ${STAGING_KERNEL_BUILDDIR}/include/
+    cp -a ${B}/scripts ${STAGING_KERNEL_BUILDDIR}
     echo ${PR} > ${STAGING_KERNEL_BUILDDIR}/mlinux_pr
 }
 
@@ -154,4 +157,4 @@ do_install_append() {
         cp -a ${STAGING_KERNEL_DIR}/include/dt-bindings ${STAGING_DIR_TARGET}/${includedir}/linux
 }
 
-FILES_kernel-dt-bindings-dev = "/usr/include/linux/dt-bindings"
+FILES_kernel-dt-bindings-dev = "/usr/include/linux/dt-bindings"
\ No newline at end of file
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..7e9accd 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.
@@ -78,8 +79,7 @@ python do_fetch_prepend () {
     
     gitversion = d.getVar("PV",True)
 
-    PV = gitversion
-    PV += "-"
+    PV = gitversion + "-"
     try:
       PV += d.getVar("PR",True)
     except TypeError:
@@ -171,7 +171,9 @@ FILES_${PN}-noarch = " \
                     ${sysconfdir}/default/ \
                     ${prefix}/ \
                     "
-
+do_compile() {
+    : Nothing to do
+}
 MR = "${WORKDIR}/rs9113"
 do_install () {
    bbnote "pwd,ls: $(pwd) $(ls) WORKDIR is ${WORKDIR}"
diff --git a/recipes-kernel/rs9113/rs9113_1.6.1.bb b/recipes-kernel/rs9113/rs9113_1.6.1.bb
index b00b581..f06d070 100644
--- a/recipes-kernel/rs9113/rs9113_1.6.1.bb
+++ b/recipes-kernel/rs9113/rs9113_1.6.1.bb
@@ -2,7 +2,7 @@ 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"
+do_fetch[depends] += "virtual/kernel:do_shared_workdir"
 PROVIDES = "rs9113"
 FILES_${PN} = "/opt/rs9113 ${sbindir} ${sysconfdir}"
 RDEPENDS_${PN}-noarch += "bash"
@@ -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 \
diff --git a/recipes-kernel/vizzini/kernel-module-vizzini-1.1/vizzini-1.1-enable-cts.patch b/recipes-kernel/vizzini/vizzini-1.1/vizzini-1.1-enable-cts.patch
index 12e6d04..12e6d04 100644
--- a/recipes-kernel/vizzini/kernel-module-vizzini-1.1/vizzini-1.1-enable-cts.patch
+++ b/recipes-kernel/vizzini/vizzini-1.1/vizzini-1.1-enable-cts.patch
diff --git a/recipes-kernel/vizzini/kernel-module-vizzini-1.1/vizzini-1.1-rs485.patch b/recipes-kernel/vizzini/vizzini-1.1/vizzini-1.1-rs485.patch
index 6833e5b..6833e5b 100644
--- a/recipes-kernel/vizzini/kernel-module-vizzini-1.1/vizzini-1.1-rs485.patch
+++ b/recipes-kernel/vizzini/vizzini-1.1/vizzini-1.1-rs485.patch
diff --git a/recipes-kernel/vizzini/kernel-module-vizzini-1.1/xr21v141x-lnx3.10-3.11.tar.gz b/recipes-kernel/vizzini/vizzini-1.1/xr21v141x-lnx3.10-3.11.tar.gz
index 2bc7355..2bc7355 100644
--- a/recipes-kernel/vizzini/kernel-module-vizzini-1.1/xr21v141x-lnx3.10-3.11.tar.gz
+++ b/recipes-kernel/vizzini/vizzini-1.1/xr21v141x-lnx3.10-3.11.tar.gz
diff --git a/recipes-kernel/vizzini/vizzini.inc b/recipes-kernel/vizzini/vizzini.inc
index f81e3e7..48eb241 100644
--- a/recipes-kernel/vizzini/vizzini.inc
+++ b/recipes-kernel/vizzini/vizzini.inc
@@ -4,8 +4,9 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-do_fetch[depends]+="virtual/kernel:do_shared_workdir"
-INC_PR = "r1"
+do_fetch[depends] += "virtual/kernel:do_shared_workdir"
+DEPENDS = "virtual/kernel"
+RPROVIDES_kernel-module-${PN} = "vizzini"
 
 SRC_URI = " \
     file://vizzini.init \
@@ -24,12 +25,10 @@ do_compile () {
     oe_runmake
 }
 
-KERNEL_MODULE_PACKAGE_SUFFIX = ""
+PACKAGES = "kernel-module-${PN} ${PN}-dev"
 
-PACKAGES = "${PN}"
-
-FILES_${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/vizzini.ko"
-FILES_${PN} += "${sysconfdir}/init.d/vizzini"
+FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/vizzini.ko"
+FILES_kernel-module-${PN} += "${sysconfdir}/init.d/vizzini"
 
 INITSCRIPT_NAME = "vizzini"
 INITSCRIPT_PARAMS = "start 90 S ."
diff --git a/recipes-kernel/vizzini/kernel-module-vizzini_1.1.bb b/recipes-kernel/vizzini/vizzini_1.1.bb
index 978b135..8dc75f2 100644
--- a/recipes-kernel/vizzini/kernel-module-vizzini_1.1.bb
+++ b/recipes-kernel/vizzini/vizzini_1.1.bb
@@ -1,6 +1,5 @@
 require vizzini.inc
-
-PR = "${INC_PR}.2-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
+PR = "r1.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
 
 
 SRC_URI += "file://xr21v141x-lnx3.10-3.11.tar.gz \