diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-08-13 20:01:42 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-08-13 14:32:13 +0000 |
| commit | e78e9dd7838859460e6e4eb1b6416bd297810c80 (patch) | |
| tree | 4465308d965332c0d8ed2c6805552a435fddcf30 /96boards-dragonboard410c-android.yaml | |
| parent | 232c3c6c3f5be21cdfe68e1fc4e33ef43a386406 (diff) | |
96boards-dragonboard410c-android: Handle git merge failures, avoid checking out different branches
Change-Id: I99e5f3740c6e11436de88226df070f62f08e15e9
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
Diffstat (limited to '96boards-dragonboard410c-android.yaml')
| -rw-r--r-- | 96boards-dragonboard410c-android.yaml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/96boards-dragonboard410c-android.yaml b/96boards-dragonboard410c-android.yaml index 0cff42ebe3..3f1f9e911e 100644 --- a/96boards-dragonboard410c-android.yaml +++ b/96boards-dragonboard410c-android.yaml @@ -68,8 +68,6 @@ set -ex repo init -u git://codeaurora.org/platform/manifest.git -b release -m ${MANIFEST_FILENAME} --repo-url=git://codeaurora.org/tools/repo.git repo sync -j16 - repo forall -c "repo start master ." - repo forall -c "repo start labr124_01810 ." set +ex mkdir -p out cp .repo/manifest.xml out/source-manifest.xml @@ -85,7 +83,7 @@ cd $(basename "${PATCHSET}" .tar.gz) pw=${PWD} export patches=$(find . -iname *.patch | sort) - for patch in ${patches}; do echo "applying $patch"; project=$(dirname ${patch}); cd ../${project}; git am ${pw}/${patch}; cd -; done + for patch in ${patches}; do echo "applying $patch"; project=$(dirname ${patch}); cd ../${project};rm -rf .git/rebase-apply; git am ${pw}/${patch}; cd -; done cd .. rm -rf ${pw} |