diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2016-04-29 19:46:09 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:36:01 +0100 |
commit | 682cb00f0476226280a552e98976c183ac7574fa (patch) | |
tree | 31f084834494dd7c51e11d1000d304d85fa8a101 /meta/recipes-rt | |
parent | 726a2bf3bd2b31a11b63f36e33752da0580d945d (diff) | |
download | poky-682cb00f0476226280a552e98976c183ac7574fa.tar.gz |
linux-yocto-rt, core-image-rt*: Explicitly skip when PREFERRED_PROVIDER_virtual/kernel isn't set to linux-yocto-rt
* just like linux-yocto-dev is doing
* fixes following errors in world builds:
ERROR: Nothing PROVIDES 'linux-yocto-rt' (but /home/jenkins/oe/world/shr-core/openembedded-core/meta/recipes-rt/images/core-image-rt-sdk.bb DEPENDS on or otherwise requires it)
ERROR: linux-yocto-rt was skipped: PREFERRED_PROVIDER_virtual/kernel set to linux-yocto, not linux-yocto-rt
ERROR: linux-yocto-rt was skipped: PREFERRED_PROVIDER_virtual/kernel set to linux-yocto, not linux-yocto-rt
ERROR: Required build target 'core-image-rt-sdk' has no buildable providers.
Missing or unbuildable dependency chain was: ['core-image-rt-sdk', 'linux-yocto-rt']
ERROR: Nothing PROVIDES 'linux-yocto-rt' (but /home/jenkins/oe/world/shr-core/openembedded-core/meta/recipes-rt/images/core-image-rt.bb DEPENDS on or otherwise requires it)
ERROR: linux-yocto-rt was skipped: PREFERRED_PROVIDER_virtual/kernel set to linux-yocto, not linux-yocto-rt
ERROR: linux-yocto-rt was skipped: PREFERRED_PROVIDER_virtual/kernel set to linux-yocto, not linux-yocto-rt
ERROR: Required build target 'core-image-rt' has no buildable providers.
Missing or unbuildable dependency chain was: ['core-image-rt', 'linux-yocto-rt']
(From OE-Core rev: 048c901fc32a1fd9a6c4b6f68f618101dfdf94ad)
(From OE-Core rev: 6ff8b98b6f176503671c651bacecef90dd9f4d89)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-rt')
-rw-r--r-- | meta/recipes-rt/images/core-image-rt-sdk.bb | 8 | ||||
-rw-r--r-- | meta/recipes-rt/images/core-image-rt.bb | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-rt/images/core-image-rt-sdk.bb b/meta/recipes-rt/images/core-image-rt-sdk.bb index db7d581832..7ddf671bca 100644 --- a/meta/recipes-rt/images/core-image-rt-sdk.bb +++ b/meta/recipes-rt/images/core-image-rt-sdk.bb | |||
@@ -1,5 +1,13 @@ | |||
1 | require recipes-core/images/core-image-minimal.bb | 1 | require recipes-core/images/core-image-minimal.bb |
2 | 2 | ||
3 | # Skip processing of this recipe if linux-yocto-rt is not explicitly specified as the | ||
4 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
5 | # to build multiple virtual/kernel providers. | ||
6 | python () { | ||
7 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-rt": | ||
8 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | ||
9 | } | ||
10 | |||
3 | DESCRIPTION = "Small image capable of booting a device with a test suite and \ | 11 | DESCRIPTION = "Small image capable of booting a device with a test suite and \ |
4 | tools for real-time use. It includes the full meta-toolchain, development \ | 12 | tools for real-time use. It includes the full meta-toolchain, development \ |
5 | headers and libraries to form a standalone SDK." | 13 | headers and libraries to form a standalone SDK." |
diff --git a/meta/recipes-rt/images/core-image-rt.bb b/meta/recipes-rt/images/core-image-rt.bb index cab6f8b749..9c86f25335 100644 --- a/meta/recipes-rt/images/core-image-rt.bb +++ b/meta/recipes-rt/images/core-image-rt.bb | |||
@@ -1,5 +1,13 @@ | |||
1 | require recipes-core/images/core-image-minimal.bb | 1 | require recipes-core/images/core-image-minimal.bb |
2 | 2 | ||
3 | # Skip processing of this recipe if linux-yocto-rt is not explicitly specified as the | ||
4 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
5 | # to build multiple virtual/kernel providers. | ||
6 | python () { | ||
7 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-rt": | ||
8 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | ||
9 | } | ||
10 | |||
3 | DESCRIPTION = "A small image just capable of allowing a device to boot plus a \ | 11 | DESCRIPTION = "A small image just capable of allowing a device to boot plus a \ |
4 | real-time test suite and tools appropriate for real-time use." | 12 | real-time test suite and tools appropriate for real-time use." |
5 | DEPENDS = "linux-yocto-rt" | 13 | DEPENDS = "linux-yocto-rt" |