[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3521/8267] bitbake: toaster: localhostbecontroller accept custom init script for build

[Emmanuele Bassi <ebassi src gnome org>]

commit 5f0405abed7c69d0409c83522f98d734647d666a
Author: Sujith H <sujith h gmail com>
Date:   Thu Nov 24 11:19:58 2016 +0000

    bitbake: toaster: localhostbecontroller accept custom init script for build
    
    When passed variable CUSTOM_BUILD_INIT_SCRIPT to toaster
    setting, it would be nice to use it. Else toaster
    can use oe-init script. This gives an oppurtunity to
    use customized build init scritps.
    
    (Bitbake rev: 9d168bb5f05453bdb7156793eea25da0a3119b4d)
    
    Signed-off-by: Sujith H <sujith h gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../toaster/bldcontrol/localhostbecontroller.py    |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py 
b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index e5f7c98..3896a82 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -27,7 +27,7 @@ import shutil
 from django.db import transaction
 from django.db.models import Q
 from bldcontrol.models import BuildEnvironment, BRLayer, BRVariable, BRTarget, BRBitbake
-from orm.models import CustomImageRecipe, Layer, Layer_Version, ProjectLayer
+from orm.models import CustomImageRecipe, Layer, Layer_Version, ProjectLayer, ToasterSetting
 import subprocess
 
 from toastermain import settings
@@ -277,7 +277,12 @@ class LocalhostBEController(BuildEnvironmentController):
         builddir = '%s-toaster-%d' % (self.be.builddir, bitbake.req.project.id)
         oe_init = os.path.join(self.pokydirname, 'oe-init-build-env')
         # init build environment
-        self._shellcmd("bash -c 'source %s %s'" % (oe_init, builddir),
+        try:
+            custom_script = ToasterSetting.objects.get(name="CUSTOM_BUILD_INIT_SCRIPT").value
+            custom_script = custom_script.replace("%BUILDDIR%" ,builddir)
+            self._shellcmd("bash -c 'source %s'" % (custom_script))
+        except ToasterSetting.DoesNotExist:
+            self._shellcmd("bash -c 'source %s %s'" % (oe_init, builddir),
                        self.be.sourcedir)
 
         # update bblayers.conf