diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-11 13:25:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-12 22:48:47 +0100 |
commit | 7c2ff62cb42ac33c8261ee510d5237b9b59bc65f (patch) | |
tree | 9c28ba8cf410942c8685bfd9ec41f154c02e580d /meta/classes | |
parent | 6a71f661732671dd5ae5d3abce0ea41c7193754d (diff) | |
download | poky-7c2ff62cb42ac33c8261ee510d5237b9b59bc65f.tar.gz |
populate_sdk_base: Fix aarch64 OLDEST_KERNEL sdk issues
aarch64 sets OLDEST_KERNEL to 3.14. This stops the aarch64 SDK installing on
anything with an older kernel which is clearly incorrect.
I attempted to extract the correct non-overridden version from the data store
but it proved problematic and I was running into data store issues. Those
are a separate problem but there isn't time to fix this right now.
Instead just code the SDK kernel version separately to work around this for
now (and fix the autobuilder tests and SDK usage).
(From OE-Core rev: 522ba4c51fff53566678b2689d0d63c393e417b3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index b015bf062c..aa7a9a5b47 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -81,6 +81,11 @@ python write_host_sdk_manifest () { | |||
81 | POPULATE_SDK_POST_TARGET_COMMAND_append = " write_target_sdk_manifest ; " | 81 | POPULATE_SDK_POST_TARGET_COMMAND_append = " write_target_sdk_manifest ; " |
82 | POPULATE_SDK_POST_HOST_COMMAND_append = " write_host_sdk_manifest; " | 82 | POPULATE_SDK_POST_HOST_COMMAND_append = " write_host_sdk_manifest; " |
83 | 83 | ||
84 | # Some archs override this, we need the nativesdk version | ||
85 | # turns out this is hard to get from the datastore due to TRANSLATED_TARGET_ARCH | ||
86 | # manipulation. | ||
87 | SDK_OLDEST_KERNEL = "2.6.32" | ||
88 | |||
84 | fakeroot python do_populate_sdk() { | 89 | fakeroot python do_populate_sdk() { |
85 | from oe.sdk import populate_sdk | 90 | from oe.sdk import populate_sdk |
86 | from oe.manifest import create_manifest, Manifest | 91 | from oe.manifest import create_manifest, Manifest |
@@ -156,7 +161,7 @@ EOF | |||
156 | sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \ | 161 | sed -i -e 's#@SDK_ARCH@#${SDK_ARCH}#g' \ |
157 | -e 's#@SDKPATH@#${SDKPATH}#g' \ | 162 | -e 's#@SDKPATH@#${SDKPATH}#g' \ |
158 | -e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \ | 163 | -e 's#@SDKEXTPATH@#${SDKEXTPATH}#g' \ |
159 | -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \ | 164 | -e 's#@OLDEST_KERNEL@#${SDK_OLDEST_KERNEL}#g' \ |
160 | -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ | 165 | -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ |
161 | -e 's#@SDK_TITLE@#${SDK_TITLE}#g' \ | 166 | -e 's#@SDK_TITLE@#${SDK_TITLE}#g' \ |
162 | -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ | 167 | -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ |