diff options
| author | Lauri Aarnio <Lauri.Aarnio@iki.fi> | 2008-01-29 06:56:39 +0200 |
|---|---|---|
| committer | Lauri Leukkunen <lle@rahina.org> | 2008-01-31 10:12:13 +0200 |
| commit | efe07798f16741d9941e2dc73ac632950b972571 (patch) | |
| tree | a9770bcc1824a677b10ccacecc14769e233ee443 | |
| parent | 08febbea8258fc610bd0b4448a0e07ddf1f608fb (diff) | |
A fix for host-gcc parameter generation
- a bug that was introduced to sb2-init after version 1.9.0.22 caused
host-gcc to fail, because incomplete configuration was written to sb2.config
- Version number of config files was incremented, to force people to reconfigure
(sorry about that, but it is necessary!)
- fixed also a minor bug in sb2 (related to logging)
| -rwxr-xr-x | utils/sb2 | 4 | ||||
| -rwxr-xr-x | utils/sb2-init | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -78,7 +78,7 @@ function sboxify_environment() . ~/.scratchbox2/$SBOX_TARGET/sb2.config - if [ "$SBOX_CONFIG_VERSION" != "3" ]; then + if [ "$SBOX_CONFIG_VERSION" != "4" ]; then echo "Please run sb2-init for your target:" echo "name: $SBOX_TARGET" echo "dir: $SBOX_TARGET_ROOT" @@ -196,7 +196,7 @@ if [ $# -gt 0 -o "$STDIN" = true ] ; then binary="$1" shift 1 args="$@" - initialize_sb_logging $(echo $binary | sed 's/\//_/g') $args + initialize_sb_logging $(echo $binary | sed 's/\//_/g') "$args" exec $SHELL -c "$binary $args" else initialize_sb_logging sb2 diff --git a/utils/sb2-init b/utils/sb2-init index 28af361..8f51c27 100755 --- a/utils/sb2-init +++ b/utils/sb2-init @@ -50,7 +50,7 @@ function write_target_config() cat - > $HOME/.scratchbox2/$TARGET/sb2.config <<EOF # Scratchbox2 configuration file generated by sb2-init. -export SBOX_CONFIG_VERSION=3 +export SBOX_CONFIG_VERSION=4 export SBOX_TARGET_ROOT=$SBOX_TARGET_ROOT export SBOX_CPU=$ARCH export SBOX_GCC_TARGET=$GCC_TARGET @@ -149,7 +149,7 @@ you can re-run this script." fi } -SBOX_DIR=$(readlink -f $(dirname $_)/..) +export SBOX_DIR=$(readlink -f $(dirname $_)/..) REMOTEHOST= LOCALHOST= |