SDKMACHINE defaults to i686 for historical reasons but it should no longer be
the main
thing we test. Start to improve things by setting things by everywhere
explicitly so
we can then rationalise to what makes sense.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
---
config.json | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/config.json b/config.json
index ae5e4ea..6d1076b 100644
--- a/config.json
+++ b/config.json
@@ -85,6 +85,7 @@
"IMAGE_INSTALL:append = ' ssh-pregen-hostkeys'"
],
"step1" : {
+ "SDKMACHINE" : "i686",
"BBTARGETS" : "core-image-sato core-image-sato-sdk
core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-minimal:do_testimage
core-image-sato:do_testimage core-image-sato-sdk:do_testimage
core-image-sato:do_testsdk"
},
@@ -172,6 +173,7 @@
"arch-hw" : {
"BUILDINFO" : true,
"step1" : {
+ "SDKMACHINE" : "i686",
"BBTARGETS" : "core-image-sato core-image-sato-sdk
core-image-minimal core-image-minimal-dev core-image-ptest-all
core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"
}
@@ -201,10 +203,12 @@
"SSTATEDIR" : ["SSTATE_DIR ?= '${HELPERBUILDDIR}/sstate'"],
"MACHINE" : "qemuarm64",
"step1" : {
+ "SDKMACHINE" : "i686",
"BBTARGETS" : "core-image-sato core-image-sato-sdk
core-image-minimal core-image-minimal-dev core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-minimal:do_testimage
core-image-sato:do_testimage core-image-sato-sdk:do_testimage
core-image-sato:do_testsdk"
},
"step2" : {
+ "SDKMACHINE" : "i686",
"MACHINE" : "qemux86-64",
"BBTARGETS" : "core-image-sato core-image-sato-sdk
core-image-minimal core-image-minimal-dev core-image-ptest-all
core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"
@@ -326,6 +330,7 @@
"SANITYTARGETS" : "core-image-sato:do_testimage"
},
"step2" : {
+ "SDKMACHINE" : "i686",
"BBTARGETS" : "core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"
},
@@ -449,12 +454,14 @@
"step1": {
"shortname": "Build for fvp-base",
"MACHINE": "fvp-base",
+ "SDKMACHINE" : "i686",
"BBTARGETS": "core-image-minimal core-image-sato
core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"
},
"step2": {
"shortname": "Build for generic-arm64 (poky)",
"MACHINE": "generic-arm64",
+ "SDKMACHINE" : "i686",
"BBTARGETS": "core-image-minimal core-image-sato
core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"
},
@@ -462,6 +469,7 @@
"shortname": "Build for generic-arm64 (poky-altcfg)",
"DISTRO": "poky-altcfg",
"MACHINE": "generic-arm64",
+ "SDKMACHINE" : "i686",
"BBTARGETS": "core-image-minimal core-image-sato
core-image-sato:do_populate_sdk",
"SANITYTARGETS" : "core-image-sato:do_testsdk"
}
@@ -759,6 +767,7 @@
"shortname" : "mip64 n32",
"description" : "qemumips64 image using n32 as default",
"MACHINE" : "qemumips64",
+ "SDKMACHINE" : "i686",
"BBTARGETS" : "core-image-minimal
core-image-minimal:do_populate_sdk",
"SANITYTARGETS" : "core-image-minimal:do_testimage
core-image-minimal:do_testsdk",
"extravars" : [
@@ -773,6 +782,7 @@
"pkgman-non-rpm" : {
"BBTARGETS" : "core-image-sato core-image-sato-sdk
core-image-minimal core-image-minimal-dev core-image-minimal:do_populate_sdk",
"SANITYTARGETS" : "core-image-minimal:do_testimage
core-image-sato:do_testimage core-image-sato-sdk:do_testimage
core-image-minimal:do_testsdk",
+ "SDKMACHINE" : "i686",
"step1" : {
"shortname" : "x86 ipk",
"MACHINE" : "qemux86-64",
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#60935): https://lists.yoctoproject.org/g/yocto/message/60935
Mute This Topic: https://lists.yoctoproject.org/mt/101218891/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/yocto/leave/6691583/21656/737036229/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
