aboutsummaryrefslogtreecommitdiffstats
path: root/bitbake/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:54 +0000
commitc505f24ebd75c194c05c151542aa0d8cbc0efad1 (patch)
tree8c5239fd87a19e5153c7778d3dda8498e768a772 /bitbake/bin
parentc7e4404273fe19b71acbdbd39f41537c2044919d (diff)
downloadopenembedded-core-contrib-c505f24ebd75c194c05c151542aa0d8cbc0efad1.tar.gz
bitbake: toaster: remove addtoConfiguration function
This function is useless as it's called just once and makes code less readable. (Bitbake rev: 96e85159905e44533882ad8290b1c9dd252ff3ea) 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 'bitbake/bin')
-rwxr-xr-xbitbake/bin/toaster17
1 files changed, 6 insertions, 11 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 40c3c35ef19..97ca17760f9 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/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