aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2016-11-19 18:26:23 +1000
committerNathan Rossi <nathan@nathanrossi.com>2016-11-23 15:35:05 +1000
commitef0b532905f0fd94c68d3e6200c42a08e64e2205 (patch)
tree5517e47c3ee982cc9b0251d57a5f9b31270ebcec
parentd5169f7632d2bf8bb60c9dbd133d408553c29c11 (diff)
downloadmeta-xilinx-ef0b532905f0fd94c68d3e6200c42a08e64e2205.tar.gz
meta-xilinx-ef0b532905f0fd94c68d3e6200c42a08e64e2205.tar.bz2
meta-xilinx-ef0b532905f0fd94c68d3e6200c42a08e64e2205.zip
linux-xlnx: Embed Xilinx Release Version in PV and EXTENSION
Embed the Xilinx Release Version into the PV of the linux-xlnx recipes. This allows for easier determination of which version of linux-xlnx is in use and avoid any ambiguity when one or more Xilinx Release uses the same upstream kernel version. This removes the need for the comment on what the SRCREV points at, instead this is replaced with a XILINX_RELEASE_VERSION variable which contains the 'vYYYY.X' release string. This change sets the LINUX_VERSION_EXTENSION with the release version so that the kernel is compiled with the version in 'CONFIG_LOCALVERISON', this results in the kernel having the Xilinx Release Version embedded in its version which can be seen using uname or during boot: $ uname -sr Linux 4.6.0-xilinx-v2016.3 Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--recipes-kernel/linux/linux-xlnx.inc3
-rw-r--r--recipes-kernel/linux/linux-xlnx_4.6.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
index f3beaf89..14746588 100644
--- a/recipes-kernel/linux/linux-xlnx.inc
+++ b/recipes-kernel/linux/linux-xlnx.inc
@@ -1,6 +1,7 @@
# This version extension should match CONFIG_LOCALVERSION in defconfig
-LINUX_VERSION_EXTENSION ?= "-xilinx"
+XILINX_RELEASE_VERSION ?= ""
+LINUX_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}"
PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}"
# Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits
diff --git a/recipes-kernel/linux/linux-xlnx_4.6.bb b/recipes-kernel/linux/linux-xlnx_4.6.bb
index fdf865aa..c226f4bf 100644
--- a/recipes-kernel/linux/linux-xlnx_4.6.bb
+++ b/recipes-kernel/linux/linux-xlnx_4.6.bb
@@ -1,5 +1,5 @@
LINUX_VERSION = "4.6"
-# This points to xilinx-v2016.3 release tag
+XILINX_RELEASE_VERSION = "v2016.3"
SRCREV ?="0e4e4071493171bbac37bf60709022f49171c813"
include linux-xlnx.inc