diff --git a/solo-builder/alt_sync.sh b/solo-builder/alt_sync.sh index 9bb4464..6a53c29 100755 --- a/solo-builder/alt_sync.sh +++ b/solo-builder/alt_sync.sh @@ -14,7 +14,7 @@ mkdir -p sources/poky git clone git://git.yoctoproject.org/poky sources/poky 2>&1 | grep -v 'fatal' cd sources/poky git fetch -git checkout bee7e3756adf70edaeabe9d43166707aab84f581 +git checkout bee7e3756adf70edaeabe9d43166707aab84f581 2>&1 cd ../.. echo "----------------------------------------------------------------------------" @@ -22,7 +22,7 @@ mkdir -p sources/meta-fsl-arm git clone git://git.yoctoproject.org/meta-fsl-arm sources/meta-fsl-arm 2>&1 | grep -v 'fatal' cd sources/meta-fsl-arm git fetch -git checkout af392c22bf6b563525ede4a81b6755ff1dd2c1c6 +git checkout af392c22bf6b563525ede4a81b6755ff1dd2c1c6 2>&1 cd ../.. echo "----------------------------------------------------------------------------" @@ -30,7 +30,7 @@ mkdir -p sources/meta-openembedded git clone git://git.openembedded.org/meta-openembedded sources/meta-openembedded 2>&1 | grep -v 'fatal' cd sources/meta-openembedded git fetch -git checkout eb4563b83be0a57ede4269ab19688af6baa62cd2 +git checkout eb4563b83be0a57ede4269ab19688af6baa62cd2 2>&1 cd ../.. echo "----------------------------------------------------------------------------" @@ -38,8 +38,8 @@ mkdir -p sources/base git clone git://github.com/OpenSolo/3dr-yocto-bsp-base sources/base 2>&1 | grep -v 'fatal' cd sources/base git fetch -echo git checkout $name -git checkout $name +echo git checkout $name 2>&1 +git checkout $name 2>&1 cd ../.. cp sources/base/README.md . cp sources/base/setup-environment . @@ -49,8 +49,8 @@ mkdir -p sources/meta-3dr git clone git://github.com/OpenSolo/meta-3dr sources/meta-3dr 2>&1 | grep -v 'fatal' cd sources/meta-3dr git fetch -echo git checkout $name -git checkout $name +echo git checkout $name 2>&1 +git checkout $name 2>&1 cd ../.. echo "----------------------------------------------------------------------------" @@ -58,7 +58,7 @@ mkdir -p sources/meta-fsl-arm-extra git clone git://github.com/Freescale/meta-fsl-arm-extra sources/meta-fsl-arm-extra 2>&1 | grep -v 'fatal' cd sources/meta-fsl-arm-extra git fetch -git checkout 07ad83db0fb67c5023bd627a61efb7f474c52622 +git checkout 07ad83db0fb67c5023bd627a61efb7f474c52622 2>&1 cd ../.. echo "----------------------------------------------------------------------------" @@ -66,7 +66,7 @@ mkdir -p sources/meta-fsl-demos git clone git://github.com/Freescale/meta-fsl-demos sources/meta-fsl-demos 2>&1 | grep -v 'fatal' cd sources/meta-fsl-demos git fetch -git checkout 5a12677ad000a926d23c444266722a778ea228a7 +git checkout 5a12677ad000a926d23c444266722a778ea228a7 2>&1 cd ../.. echo "----------------------------------------------------------------------------" @@ -74,7 +74,7 @@ mkdir -p sources/meta-browser git clone git://github.com/OSSystems/meta-browser sources/meta-browser 2>&1 | grep -v 'fatal' cd sources/meta-browser git fetch -git checkout fc3969f63bda343c38c40a23f746c560c4735f3e +git checkout fc3969f63bda343c38c40a23f746c560c4735f3e 2>&1 cd ../.. echo "----------------------------------------------------------------------------" @@ -82,6 +82,6 @@ mkdir -p sources/meta-fsl-bsp-release git clone git://git.freescale.com/imx/meta-fsl-bsp-release sources/meta-fsl-bsp-release 2>&1 | grep -v 'fatal' cd sources/meta-fsl-bsp-release git fetch -git checkout dora_3.10.17-1.0.0_GA +git checkout dora_3.10.17-1.0.0_GA 2>&1 cd ../.. cp sources/meta-fsl-bsp-release/imx/tools/fsl-setup-release.sh . diff --git a/solo-builder/builder.sh b/solo-builder/builder.sh index 878c526..75ca6c1 100755 --- a/solo-builder/builder.sh +++ b/solo-builder/builder.sh @@ -43,7 +43,8 @@ esac echo #Do it. -/vagrant/alt_sync.sh $GIT_BRANCH +/vagrant/alt_sync.sh $GIT_BRANCH 2>&1 +echo "sync done" cd /solo-build-alt @@ -96,7 +97,7 @@ fi # Copy the relevant files to a date/time stamped completed directory in the git repo folder for easy access (on git ignore list). # Make an MD5sum of each as is required for the Solo and Controller to accept the files. # The tar.gz and the .md5 go directly in the /log/updates/ directory on the solo and/or controller. -NEW_DIR=/vagrant/"completed_$(date +%F_%H-%M)" +NEW_DIR=/vagrant/www/"completed_$(date +%F_%H-%M)" mkdir -p $NEW_DIR cd $NEW_DIR