summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-12-17 16:48:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-18 13:51:36 +0000
commit96e85159905e44533882ad8290b1c9dd252ff3ea (patch)
treed25d6ecd5edc3dc9f2272bd6a9e8398ff96be811 /bin
parentb4789c9e3093e1ec8e70f67305c88709443578e6 (diff)
downloadbitbake-contrib-96e85159905e44533882ad8290b1c9dd252ff3ea.tar.gz
toaster: remove addtoConfiguration function
This function is useless as it's called just once and makes code less readable. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/toaster17
1 files changed, 6 insertions, 11 deletions
diff --git a/bin/toaster b/bin/toaster
index 40c3c35ef..97ca17760 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -83,16 +83,6 @@ webserverStartAll()
return $retval
}
-# Helper functions to add a special configuration file
-
-addtoConfiguration()
-{
- file=$1
- shift
- echo "#Created by toaster start script" > ${BUILDDIR}/conf/$file
- for var in "$@"; do echo $var >> ${BUILDDIR}/conf/$file; done
-}
-
INSTOPSYSTEM=0
# define the stop command
@@ -339,7 +329,12 @@ fi
case $CMD in
start )
- addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE
+ # Create configuration file
+ conf=${BUILDDIR}/conf/toaster.conf
+ echo "# Created by toaster start script" > $conf
+ echo "INHERIT+=\"toaster buildhistory\"" >> $conf
+ [ -n "$TOASTER_BRBE" ] && echo $TOASTER_BRBE >> $conf
+
if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
echo "Failed ${CMD}."
return 4