@@ -41,39 +41,9 @@
"WRITECONFIG" : true,
"SENDERRORS" : true,
"extravars" : [
- "QEMU_USE_KVM = 'True'",
- "INHERIT += 'report-error'",
- "PREMIRRORS = ''",
- "BB_GENERATE_MIRROR_TARBALLS = '1'",
- "BB_NUMBER_THREADS = '16'",
- "BB_NUMBER_PARSE_THREADS = '16'",
- "PARALLEL_MAKE = '-j 16 -l 75'",
- "BB_PRESSURE_MAX_CPU = '20000'",
- "BB_PRESSURE_MAX_IO = '20000'",
- "XZ_MEMLIMIT = '5%'",
- "XZ_THREADS = '8'",
- "ZSTD_THREADS = '8'",
- "BB_TASK_NICE_LEVEL = '5'",
- "BB_TASK_NICE_LEVEL:task-testimage = '0'",
- "BB_TASK_IONICE_LEVEL = '2.7'",
- "BB_TASK_IONICE_LEVEL:task-testimage = '2.1'",
- "IMAGE_CLASSES += 'testimage'",
- "TEST_QEMUBOOT_TIMEOUT = '1500'",
"SANITY_TESTED_DISTROS = ''",
- "SDK_EXT_TYPE = 'minimal'",
- "SDK_INCLUDE_TOOLCHAIN = '1'",
- "ESDK_LOCALCONF_REMOVE:append = 'BB_HASHSERVE'",
- "BB_DISKMON_DIRS = 'STOPTASKS,${TMPDIR},1G,100K STOPTASKS,${DL_DIR},1G STOPTASKS,${SSTATE_DIR},1G STOPTASKS,/tmp,100M,30K HALT,${TMPDIR},100M,1K HALT,${DL_DIR},100M HALT,${SSTATE_DIR},100M HALT,/tmp,10M,1K'",
"BB_HASHSERVE = '${AUTOBUILDER_HASHSERV}'",
- "RUNQEMU_TMPFS_DIR = '/home/pokybuild/tmp'",
- "BB_HEARTBEAT_EVENT = '60'",
- "BB_LOG_HOST_STAT_ON_INTERVAL = '1'",
- "BB_LOG_HOST_STAT_CMDS_INTERVAL = 'oe-time-dd-test.sh -c 100 -t 3'",
- "BB_LOG_HOST_STAT_ON_FAILURE = '1'",
- "BB_LOG_HOST_STAT_CMDS_FAILURE = 'oe-time-dd-test.sh -l'",
- "SDK_TOOLCHAIN_LANGS += 'rust'",
- "BB_SERVER_TIMEOUT = '60'",
- "BB_LOADFACTOR_MAX = '1.5'"
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/autobuilder core/yocto-autobuilder/autobuilder-resource-constraints'"
]
},
"templates" : {
@@ -866,9 +836,7 @@
"MACHINE" : "qemux86-64",
"BBTARGETS" : "world",
"extravars" : [
- "require conf/multilib.conf",
- "MULTILIBS = 'multilib:lib32'",
- "DEFAULTTUNE:virtclass-multilib-lib32 = 'x86'"
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/multilib-x86-lib32'"
]
},
"qemux86-world-alt" : {
@@ -877,9 +845,7 @@
"BBTARGETS" : "world",
"extravars" : [
"DISTRO_FEATURES:append = ' api-documentation'",
- "require conf/multilib.conf",
- "MULTILIBS = 'multilib:lib32'",
- "DEFAULTTUNE:virtclass-multilib-lib32 = 'x86'"
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/multilib-x86-lib32'"
]
},
"qemux86-64-x32" : {
@@ -921,9 +887,7 @@
"SANITYTARGETS" : "lib32-core-image-minimal:do_testimage",
"extravars" : [
"TEST_SUITES = 'ping'",
- "require conf/multilib.conf",
- "MULTILIBS = 'multilib:lib32'",
- "DEFAULTTUNE:virtclass-multilib-lib32 = 'x86'"
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/multilib-x86-lib32'"
]
},
"step2" : {
@@ -934,9 +898,7 @@
"SANITYTARGETS" : "lib32-core-image-minimal:do_testimage",
"extravars" : [
"TEST_SUITES = 'ping'",
- "require conf/multilib.conf",
- "MULTILIBS = 'multilib:lib32'",
- "DEFAULTTUNE:virtclass-multilib-lib32 = 'x86'"
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/multilib-x86-lib32'"
]
},
"step3" : {
@@ -946,9 +908,7 @@
"SANITYTARGETS" : "core-image-sato:do_testimage",
"extravars" : [
"TEST_SUITES:append = ' multilib'",
- "require conf/multilib.conf",
- "MULTILIBS = 'multilib:lib32'",
- "DEFAULTTUNE:virtclass-multilib-lib32 = 'x86'",
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/multilib-x86-lib32'",
"RPM_PREFER_ELF_ARCH = '1'",
"IMAGE_INSTALL:append = ' lib32-connman-gnome pango-module-basic-fc lib32-pango-module-basic-fc'"
]
@@ -961,9 +921,7 @@
"SANITYTARGETS" : "core-image-sato:do_testimage",
"extravars" : [
"TEST_SUITES:append = ' multilib'",
- "require conf/multilib.conf",
- "MULTILIBS = 'multilib:lib32'",
- "DEFAULTTUNE:virtclass-multilib-lib32 = 'x86'",
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/multilib-x86-lib32'",
"RPM_PREFER_ELF_ARCH = '1'",
"IMAGE_INSTALL:append = ' lib32-connman-gnome pango-module-basic-fc lib32-pango-module-basic-fc'"
]
@@ -974,9 +932,7 @@
"MACHINE" : "qemux86",
"BBTARGETS" : "lib64-core-image-sato lib64-core-image-sato-sdk",
"extravars" : [
- "require conf/multilib.conf",
- "MULTILIBS = 'multilib:lib64'",
- "DEFAULTTUNE:virtclass-multilib-lib64 = 'x86-64'"
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/multilib-x86-lib64'"
]
},
"step6" : {
@@ -986,11 +942,7 @@
"BBTARGETS" : "core-image-minimal core-image-minimal:do_populate_sdk",
"SANITYTARGETS" : "core-image-minimal:do_testimage core-image-minimal:do_testsdk",
"extravars" : [
- "require conf/multilib.conf",
- "MULTILIBS = 'multilib:lib64 multilib:lib32'",
- "DEFAULTTUNE = 'mips64-n32'",
- "DEFAULTTUNE:virtclass-multilib-lib64 = 'mips64'",
- "DEFAULTTUNE:virtclass-multilib-lib32 = 'mips32r2'"
+ "OE_FRAGMENTS += 'core/yocto-autobuilder/multilib-mips64-n32'"
]
}
},
Switch the autobuilder to use the config fragements in OE-Core, maintained there so people can easily see and test with them if needed. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- config.json | 66 ++++++++--------------------------------------------- 1 file changed, 9 insertions(+), 57 deletions(-)