aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-03-08 15:29:34 -0800
committerJuro Bystricky <juro.bystricky@intel.com>2017-03-17 09:30:25 -0700
commit38238f8ea7c8096d91c5cda764be7c60bf7d32e5 (patch)
tree5f65434dcd54b944f6120b520aa541fe894411b0
parent6fb096ca458df263c44409508d9ad0b084a4ded7 (diff)
downloadmeta-zephyr-38238f8ea7c8096d91c5cda764be7c60bf7d32e5.tar.gz
meta-zephyr-38238f8ea7c8096d91c5cda764be7c60bf7d32e5.tar.bz2
meta-zephyr-38238f8ea7c8096d91c5cda764be7c60bf7d32e5.zip
zephyr-kernel.inc: also support Zephyr 1.7.0
Build kernel tests suite and kernel samples based on PREFERRED_VERSION_zephyr-kernel Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
-rw-r--r--classes/zephyr-kernel-src.bbclass31
-rw-r--r--recipes-kernel/zephyr-kernel/zephyr-kernel.inc12
2 files changed, 32 insertions, 11 deletions
diff --git a/classes/zephyr-kernel-src.bbclass b/classes/zephyr-kernel-src.bbclass
new file mode 100644
index 0000000..d7aa81b
--- /dev/null
+++ b/classes/zephyr-kernel-src.bbclass
@@ -0,0 +1,31 @@
+#Set relevant variables based on Zephyr kernel version
+
+PREFERRED_VERSION_zephyr-kernel ??= "1.6.0"
+
+SRCREV = "d4e799d77a36eaf6d678b357c207411ec32b2d62"
+SRC_URI = "git://gerrit.zephyrproject.org/r/zephyr.git;protocol=https;branch=v1.6.0-branch \
+ file://Makefile.toolchain.yocto "
+PV = "1.6.0"
+
+# FIXME: This points to 1.7.rc4
+SRCREV_1.7 = "3d2893cf85d51ceca04aa3bec2dd5fc77625ff81"
+SRC_URI_1.7 = "git://gerrit.zephyrproject.org/r/zephyr.git;protocol=https;branch=v1.7-branch\
+ file://Makefile.toolchain.yocto "
+PV_1.7 = "1.7.0"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
+
+ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/"
+
+python () {
+ src_pn = d.getVar('PREFERRED_VERSION_zephyr-kernel', True)
+ if src_pn == '1.6.0':
+ return
+ elif src_pn == '1.7.0':
+ d.setVar('SRC_URI',d.getVar('SRC_URI_1.7', True))
+ d.setVar('SRCREV',d.getVar('SRCREV_1.7', True))
+ d.setVar('PV',d.getVar('PV_1.7', True))
+ else:
+ bb.error("Unsupported Zephyr kernel version requested")
+}
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel.inc
index 59b0713..ec7b5ae 100644
--- a/recipes-kernel/zephyr-kernel/zephyr-kernel.inc
+++ b/recipes-kernel/zephyr-kernel/zephyr-kernel.inc
@@ -1,15 +1,5 @@
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
-# tag v1.6.0
-SRCREV="d4e799d77a36eaf6d678b357c207411ec32b2d62"
-SRC_URI = "git://gerrit.zephyrproject.org/r/zephyr.git;protocol=https;branch=v1.6.0-branch"
-SRC_URI += "file://Makefile.toolchain.yocto"
-
-PV = "1.6.0"
-
-# Most tests for Zephyr 1.6 are in the "legacy" folder
-ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/"
+inherit zephyr-kernel-src
S = "${WORKDIR}/git"