summaryrefslogtreecommitdiff
path: root/recipes-kernel
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2017-03-27 20:08:01 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-04-07 11:32:23 +0200
commita9524afaecae1f21fa8ad6cae4efd404349b54d9 (patch)
tree9f486b69cf5c36528a793308c79e9364ce50245a /recipes-kernel
parent9ec772bd417d9ba7633ad3698919bb8060658cf3 (diff)
linux: use the new version variables
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb5
-rw-r--r--recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb5
-rw-r--r--recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend5
-rw-r--r--recipes-kernel/linux/linux-toradex_4.4.bbappend6
4 files changed, 17 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb b/recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb
index f6868d9..52134c4 100644
--- a/recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb
+++ b/recipes-kernel/linux/linux-toradex-rt_4.1-2.0.x.bb
@@ -1,5 +1,6 @@
require recipes-kernel/linux/linux-imx.inc
require recipes-kernel/linux/linux-dtb.inc
+include conf/tdx_version.conf
SUMMARY = "Real-Time Linux kernel for Toradex Freescale i.MX based modules"
@@ -19,7 +20,9 @@ SRC_URI[rt-patch.sha256sum] = "284a1bc0094df0a61e6dcb9996eceea6a3791ccba1e5763e3
# Load USB functions configurable through configfs (CONFIG_USB_CONFIGFS)
KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
-LOCALVERSION = "-v2.7b1-rt"
+LOCALVERSION = "-${PR}"
+PR = "${TDX_VER_INT}-rt"
+
SRCBRANCH = "toradex_4.1-2.0.x-imx-next"
SRCREV = "507c1bf97373cb3bd982f12ddebec1891922dbb8"
diff --git a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb
index 61d7ab6..76188bc 100644
--- a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb
+++ b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bb
@@ -1,5 +1,6 @@
require recipes-kernel/linux/linux-imx.inc
require recipes-kernel/linux/linux-dtb.inc
+include conf/tdx_version.conf
SUMMARY = "Linux kernel for Toradex Freescale i.MX based modules"
@@ -9,7 +10,9 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRAN
# Load USB functions configurable through configfs (CONFIG_USB_CONFIGFS)
KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
-LOCALVERSION = "-v2.7b1"
+LOCALVERSION = "-${PR}"
+PR = "${TDX_VER_INT}"
+
SRCBRANCH = "toradex_4.1-2.0.x-imx-next"
SRCREV = "507c1bf97373cb3bd982f12ddebec1891922dbb8"
diff --git a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend
index dcea5f5..49b5490 100644
--- a/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend
+++ b/recipes-kernel/linux/linux-toradex_4.1-2.0.x.bbappend
@@ -1,5 +1,8 @@
+#include conf/tdx_version.conf
FILESEXTRAPATHS_prepend := "${THISDIR}/linux-toradex-4.1-2.0.x:"
-#LOCALVERSION = "-v2.7b1"
+#LOCALVERSION = "-${PR}"
+#PR = "${TDX_VER_INT}"
+
#SRCREV = "507c1bf97373cb3bd982f12ddebec1891922dbb8"
#SRCBRANCH = "toradex_4.1-2.0.x-imx-next"
diff --git a/recipes-kernel/linux/linux-toradex_4.4.bbappend b/recipes-kernel/linux/linux-toradex_4.4.bbappend
index ae6a470..8309f23 100644
--- a/recipes-kernel/linux/linux-toradex_4.4.bbappend
+++ b/recipes-kernel/linux/linux-toradex_4.4.bbappend
@@ -1,5 +1,9 @@
+include conf/tdx_version.conf
+
FILESEXTRAPATHS_prepend := "${THISDIR}/linux-toradex-4.4:"
-LOCALVERSION = "-v2.7b1"
+LOCALVERSION = "-${PR}"
+PR = "${TDX_VER_INT}"
+
SRCREV = "c9bd85a938f780f586a6522c55e3ca07354bdcb9"
SRCBRANCH = "toradex_vf_4.4-next"