[PATCH] distro11s: better tag handling when FORCE_BUILD

[jasonabele]

From 27a15af49e3cd5b9d7f3202fbbd0b75db5ffe915 Mon Sep 17 00:00:00 2001
From: Jason Abele <jason@cozybit.com>
Date: Fri, 9 Aug 2013 10:40:53 -0700
Subject: [PATCH] distro11s: better tag handling when FORCE_BUILD

Signed-off-by: Jason Abele <jason@cozybit.com>

---
 scripts/common.sh |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index cb759d9..8e67af5 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -54,7 +54,9 @@ function update_pkg {
                git remote rm origin
                git remote add origin ${URL}
                git remote update origin
-               if [ "${BRANCH}" = "" ]; then
+               if [ "${TAG}" != "" ]; then
+                   git checkout -q ${TAG}
+               elif [ "${BRANCH}" = "" ]; then
                    git branch -D ${BRANCH}
                    git checkout -b ${BRANCH} origin/${BRANCH}
                else
-- 
1.7.9.5

[jasonabele]

Note: this patch addresses the error seen in build 28 (http://boo.local:8080/job/distro11s-qemu/28/console)

Avoids switching from tag to branch to tag in the FORCE_BUILD case of the fetch.sh script ... error is from different file structure in libnl on the master branch vs the tag specified for distro11s.

Fetching origin From git://git.infradead.org/users/tgr/libnl

• [new branch] master -> origin/master error: branch 'master' not found. error: Your local changes to the following files would be overwritten by checkout: doc/INSTALL Please, commit your changes or stash them before you can switch branches. Aborting

[silverjam]

rebased against new master