MIRRORS/yocto-autobuilder-helper
1
0
Fork 0
mirror of git://git.yoctoproject.org/yocto-autobuilder-helper.git synced 2025-07-19 20:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add sdk-extra handling, DL_DIR and SSTATE_DIR

Browse Source 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-01-17 18:24:20 +00:00
parent 8e3081ffd7
commit 88973c3c99
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config.json
View File

@ -8,6 +8,9 @@
"SDKMACHINE" : "i686", "SDKMACHINE" : "i686",
"PACKAGE_CLASSES" : "package_rpm package_deb package_ipk", "PACKAGE_CLASSES" : "package_rpm package_deb package_ipk",
"PRSERV" : "PRSERV_HOST = 'localhost:0'", "PRSERV" : "PRSERV_HOST = 'localhost:0'",
"DLDIR" : "DL_DIR = '/srv/www/vhosts/autobuilder.yoctoproject.org/current_sources'",
"SSTATEDIR" : "SSTATE_DIR ?= '/srv/www/vhosts/autobuilder.yoctoproject.org/pub/sstate'",
"SDKEXTRAS" : ["SSTATE_MIRRORS += '\\", "file://.* http://sstate.yoctoproject.org/dev/PATH;downloadfilename=PATH'"],
"extravars" : [ "extravars" : [
"QEMU_USE_KVM = 'True'", "QEMU_USE_KVM = 'True'",
"INHERIT += 'report-error'", "INHERIT += 'report-error'",
@ -20,7 +23,10 @@
"BB_TASK_IONICE_LEVEL = '2.7'", "BB_TASK_IONICE_LEVEL = '2.7'",
"BB_TASK_IONICE_LEVEL_task-testimage = '2.1'", "BB_TASK_IONICE_LEVEL_task-testimage = '2.1'",
"INHERIT += 'testimage'", "INHERIT += 'testimage'",
"TEST_QEMUBOOT_TIMEOUT = '1500'" "TEST_QEMUBOOT_TIMEOUT = '1500'",
"SANITY_TESTED_DISTROS = ''",
"SDK_EXT_TYPE = 'minimal'",
"SDK_INCLUDE_TOOLCHAIN = '1'"
] ]
}, },
@ -426,8 +432,11 @@
}, },
"build-appliance" : { "build-appliance" : {
"MACHINE" : "qemux86-64", "MACHINE" : "qemux86-64",
"DLDIR" : "DL_DIR ?= '${TOPDIR}/downloads'",
"extravars" : [ "extravars" : [
"SOURCE_MIRROR_FETCH = '1'" "SOURCE_MIRROR_FETCH = '1'",
"INHERIT += 'own-mirrors'",
"SOURCE_MIRROR_URL = 'file:///srv/www/vhosts/autobuilder.yoctoproject.org/current_sources'"
] ]
}, },
"nightly-non-gpl3" : { "nightly-non-gpl3" : {
@ -489,6 +498,7 @@
"SDKMACHINE" : "x86_64", "SDKMACHINE" : "x86_64",
"DISTRO" : "refkit", "DISTRO" : "refkit",
"PACKAGE_CLASSES" : "package_ipk", "PACKAGE_CLASSES" : "package_ipk",
"SSTATEDIR" : false,
"PRSERV" : false, "PRSERV" : false,
"extravars" : [ "extravars" : [
"require conf/distro/include/refkit-ci.inc", "require conf/distro/include/refkit-ci.inc",
@ -538,7 +548,8 @@
"SDKMACHINE" : "x86_64", "SDKMACHINE" : "x86_64",
"BBTARGETS" : "core-image-sato", "BBTARGETS" : "core-image-sato",
"extravars" : [ "extravars" : [
"TMPDIR = '${TOPDIR}/newtmp'" "TMPDIR = '${TOPDIR}/newtmp'",
"require ../locked-sigs.inc"
] ]
}, },
"step8" : { "step8" : {

12
scripts/setup-config
View File

@ -100,9 +100,10 @@ for v in ["MACHINE", "DISTRO", "SDKMACHINE"]:
distro = getconfigvar("DISTRO", ourconfig, target, stepnum) distro = getconfigvar("DISTRO", ourconfig, target, stepnum)
prserv = getconfigvar("PRSERV", ourconfig, target, stepnum) for v in ["DLDIR", "PRSERV", "SSTATEDIR"]:
if prserv: value = getconfigvar(v, ourconfig, target, stepnum)
variables.append(prserv) if value:
variables.append(value)
extravars = getconfiglist("extravars", ourconfig, target, stepnum) extravars = getconfiglist("extravars", ourconfig, target, stepnum)
if extravars: if extravars:
@ -131,4 +132,9 @@ with open(autoconf, "w") as f:
print(v) print(v)
f.write(v + "\n") f.write(v + "\n")
print("Writing %s with contents:" % sdkextraconf)
with open(sdkextraconf, "w") as f:
for v in getconfiglist("SDKEXTRAS", ourconfig, target, stepnum):
print(v)
f.write(v + "\n")