diff --git a/solo-builder/builder.sh b/solo-builder/builder.sh index 8c78fd9..9d6bf15 100755 --- a/solo-builder/builder.sh +++ b/solo-builder/builder.sh @@ -45,7 +45,7 @@ esac echo #Do it. -/vagrant/alt_sync.sh $GIT_BRANCH 2>&1 +/vagrant/solo-builder/source_sync.sh $GIT_BRANCH 2>&1 echo "sync done" cd /solo-build-alt diff --git a/solo-builder/alt_sync.sh b/solo-builder/source_sync.sh similarity index 83% rename from solo-builder/alt_sync.sh rename to solo-builder/source_sync.sh index acea74c..735febc 100755 --- a/solo-builder/alt_sync.sh +++ b/solo-builder/source_sync.sh @@ -37,24 +37,27 @@ cd ../.. echo "----------------------------------------------------------------------------" 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 2>&1 -git checkout $name 2>&1 -cd ../.. +rsync -r /vagrant/3dr-yocto-bsp-base/ sources/base --delete +# 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 2>&1 +# git checkout $name 2>&1 +# cd ../.. cp sources/base/README.md . cp sources/base/setup-environment . echo "----------------------------------------------------------------------------" 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 2>&1 -git checkout $name 2>&1 -git pull origin -cd ../.. +rsync -r /vagrant/meta-3dr/ sources/meta-3dr --delete +# 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 2>&1 +# git checkout $name 2>&1 +# git pull origin echo "----------------------------------------------------------------------------" mkdir -p sources/meta-fsl-arm-extra