From 88973c3c99adb7328fd779ba33fa62c81a7ce21d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 17 Jan 2018 18:24:20 +0000
Subject: [PATCH] Add sdk-extra handling, DL_DIR and SSTATE_DIR

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 config.json          | 17 ++++++++++++++---
 scripts/setup-config | 12 +++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/config.json b/config.json
index 715502e..e51fe72 100644
--- a/config.json
+++ b/config.json
@@ -8,6 +8,9 @@
         "SDKMACHINE" : "i686",
         "PACKAGE_CLASSES" : "package_rpm package_deb package_ipk",
         "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" : [
             "QEMU_USE_KVM = 'True'",
             "INHERIT += 'report-error'",
@@ -20,7 +23,10 @@
             "BB_TASK_IONICE_LEVEL = '2.7'",
             "BB_TASK_IONICE_LEVEL_task-testimage = '2.1'",
             "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" : {
             "MACHINE" : "qemux86-64",
+            "DLDIR" : "DL_DIR ?= '${TOPDIR}/downloads'",
             "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" : {
@@ -489,6 +498,7 @@
             "SDKMACHINE" : "x86_64",
             "DISTRO" : "refkit",
             "PACKAGE_CLASSES" : "package_ipk",
+            "SSTATEDIR" : false,
             "PRSERV" : false,
             "extravars" : [
                 "require conf/distro/include/refkit-ci.inc",
@@ -538,7 +548,8 @@
                 "SDKMACHINE" : "x86_64",
                 "BBTARGETS" : "core-image-sato",
                 "extravars" : [
-                    "TMPDIR = '${TOPDIR}/newtmp'"
+                    "TMPDIR = '${TOPDIR}/newtmp'",
+                    "require ../locked-sigs.inc"
                 ]
             },
             "step8" : {
diff --git a/scripts/setup-config b/scripts/setup-config
index 8ba50d6..76a4d4e 100755
--- a/scripts/setup-config
+++ b/scripts/setup-config
@@ -100,9 +100,10 @@ for v in ["MACHINE", "DISTRO", "SDKMACHINE"]:
 
 distro = getconfigvar("DISTRO", ourconfig, target, stepnum)
 
-prserv = getconfigvar("PRSERV", ourconfig, target, stepnum)
-if prserv:
-    variables.append(prserv)
+for v in ["DLDIR", "PRSERV", "SSTATEDIR"]:
+    value = getconfigvar(v, ourconfig, target, stepnum)
+    if value:
+        variables.append(value)
 
 extravars = getconfiglist("extravars", ourconfig, target, stepnum)
 if extravars:
@@ -131,4 +132,9 @@ with open(autoconf, "w") as f:
         print(v)
         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")