diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-12-17 16:48:52 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-18 13:51:54 +0000 |
| commit | c505f24ebd75c194c05c151542aa0d8cbc0efad1 (patch) | |
| tree | 8c5239fd87a19e5153c7778d3dda8498e768a772 | |
| parent | c7e4404273fe19b71acbdbd39f41537c2044919d (diff) | |
| download | poky-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>
| -rwxr-xr-x | bitbake/bin/toaster | 17 |
1 files changed, 6 insertions, 11 deletions
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() | |||
| 83 | return $retval | 83 | return $retval |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | # Helper functions to add a special configuration file | ||
| 87 | |||
| 88 | addtoConfiguration() | ||
| 89 | { | ||
| 90 | file=$1 | ||
| 91 | shift | ||
| 92 | echo "#Created by toaster start script" > ${BUILDDIR}/conf/$file | ||
| 93 | for var in "$@"; do echo $var >> ${BUILDDIR}/conf/$file; done | ||
| 94 | } | ||
| 95 | |||
| 96 | INSTOPSYSTEM=0 | 86 | INSTOPSYSTEM=0 |
| 97 | 87 | ||
| 98 | # define the stop command | 88 | # define the stop command |
| @@ -339,7 +329,12 @@ fi | |||
| 339 | 329 | ||
| 340 | case $CMD in | 330 | case $CMD in |
| 341 | start ) | 331 | start ) |
| 342 | addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE | 332 | # Create configuration file |
| 333 | conf=${BUILDDIR}/conf/toaster.conf | ||
| 334 | echo "# Created by toaster start script" > $conf | ||
| 335 | echo "INHERIT+=\"toaster buildhistory\"" >> $conf | ||
| 336 | [ -n "$TOASTER_BRBE" ] && echo $TOASTER_BRBE >> $conf | ||
| 337 | |||
| 343 | if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then | 338 | if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then |
| 344 | echo "Failed ${CMD}." | 339 | echo "Failed ${CMD}." |
| 345 | return 4 | 340 | return 4 |
