From c505f24ebd75c194c05c151542aa0d8cbc0efad1 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 17 Dec 2015 16:48:52 +0000 Subject: 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 Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- bitbake/bin/toaster | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 40c3c35ef1..97ca17760f 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 -- cgit v1.2.3-54-g00ecf