[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1801/8267] bitbake: toaster: Remove old toaster config loading mechanism

[Emmanuele Bassi <ebassi src gnome org>]

commit 71f553b0227a3f36fe5b8d0f536b04b3c13eb2d7
Author: Michael Wood <michael g wood intel com>
Date:   Mon Aug 1 19:49:43 2016 +0100

    bitbake: toaster: Remove old toaster config loading mechanism
    
    This has been replaced using django's inbuilt loaddata.
    Django command documented at:
    https://docs.djangoproject.com/en/1.8/ref/django-admin/#django-admin-loaddata
    
    (Bitbake rev: 3edd33aff2b9eef82090dc4f9b5461f901aec8be)
    
    Signed-off-by: Michael Wood <michael g wood intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/bin/toaster                                |   15 --
 .../management/commands/checksettings.py           |   33 ----
 .../bldcontrol/management/commands/loadconf.py     |  179 --------------------
 3 files changed, 0 insertions(+), 227 deletions(-)
---
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 80d07ab..e35bfce 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -101,7 +101,6 @@ stop_system()
     fi
     webserverKillAll
     # unset exported variables
-    unset TOASTER_CONF
     unset TOASTER_DIR
     unset BITBAKE_UI
     unset BBBASEDIR
@@ -154,23 +153,9 @@ if [ -n "$TEMPLATECONF" ]; then
         if [ -d "$OEROOT/$TEMPLATECONF" ]; then
             TEMPLATECONF="$OEROOT/$TEMPLATECONF"
         fi
-        if [ ! -d "$TEMPLATECONF" ]; then
-            echo >&2 "Error: '$TEMPLATECONF' must be a directory containing toasterconf.json"
-            return 1
-        fi
     fi
 fi
 
-if [ "$TOASTER_CONF" = "" ]; then
-    TOASTER_CONF="$TEMPLATECONF/toasterconf.json"
-    export TOASTER_CONF=$(python3 -c "import os; print(os.path.realpath('$TOASTER_CONF'))")
-fi
-
-if [ ! -f $TOASTER_CONF ]; then
-    echo "$TOASTER_CONF configuration file not found. Set TOASTER_CONF to specify file or fix .templateconf"
-    return 1
-fi
-
 # this defines the dir toaster will use for
 # 1) clones of layers (in _toaster_clones )
 # 2) the build dir (in build)
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py 
b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
index fcee8b0..0dc55f6 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
@@ -26,39 +26,6 @@ class Command(NoArgsCommand):
         super(Command, self).__init__(*args, **kwargs)
         self.guesspath = DN(DN(DN(DN(DN(DN(DN(__file__)))))))
 
-    def _find_first_path_for_file(self, startdirectory, filename, level=0):
-        if level < 0:
-            return None
-        dirs = []
-        for i in os.listdir(startdirectory):
-            j = os.path.join(startdirectory, i)
-            if os.path.isfile(j):
-                if i == filename:
-                    return startdirectory
-            elif os.path.isdir(j):
-                dirs.append(j)
-        for j in dirs:
-            ret = self._find_first_path_for_file(j, filename, level - 1)
-            if ret is not None:
-                return ret
-        return None
-
-    def _recursive_list_directories(self, startdirectory, level=0):
-        if level < 0:
-            return []
-        dirs = []
-        try:
-            for i in os.listdir(startdirectory):
-                j = os.path.join(startdirectory, i)
-                if os.path.isdir(j):
-                    dirs.append(j)
-        except OSError:
-            pass
-        for j in dirs:
-            dirs = dirs + self._recursive_list_directories(j, level - 1)
-        return dirs
-
-
     def _verify_build_environment(self):
         # provide a local build env. This will be extended later to include non local
         if BuildEnvironment.objects.count() == 0: