From 12d3df686079404fc139e4af2ac272d5ee16e14e Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 29 Jan 2009 12:52:21 +0000
Subject: [PATCH] Fix checkout and update of stable branch openembedded
 directory.  Thx shoragan for tips.

---
 Makefile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c5e00fa..f0ee752 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ setup:  setup-common setup-bitbake setup-openembedded \
 	setup-fso-unstable setup-fso-testing setup-fso-${FSO_STABLE_MILESTONE}
 
 .PHONY: update
-update: update-common update-bitbake update-openembedded
+update: update-common update-bitbake update-openembedded \
+	update-fso-${FSO_STABLE_MILESTONE}
 
 .PHONY: status
 status: status-common status-bitbake status-openembedded
@@ -134,9 +135,10 @@ setup-fso-${FSO_STABLE_MILESTONE}:
 	rm -f fso-${FSO_STABLE_MILESTONE}/.configured
 	rm -rf fso-${FSO_STABLE_MILESTONE}/openembedded
 	( cd fso-${FSO_STABLE_MILESTONE} ; \
-	  git clone ../openembedded ; \
+	  git clone --reference ../openembedded git://git.openembedded.net/openembedded openembedded; \
 	  cd openembedded ; \
-	  git checkout -b ${FSO_STABLE_BRANCH} ${FSO_STABLE_VERSION} )
+	  git checkout --no-track -b ${FSO_STABLE_BRANCH} origin/${FSO_STABLE_BRANCH}; \
+	  git reset --hard ${FSO_STABLE_VERSION} )
 	touch fso-${FSO_STABLE_MILESTONE}/.configured
 
 .PRECIOUS: fso-%/.configured
@@ -176,6 +178,13 @@ update-bitbake: bitbake/.svn/entries
 update-openembedded: openembedded/.git/config
 	( cd openembedded ; git pull )
 
+.PHONY: update-fso-${FSO_STABLE_MILESTONE}
+update-fso-${FSO_STABLE_MILESTONE}: fso-${FSO_STABLE_MILESTONE}/.configured
+	( cd fso-${FSO_STABLE_MILESTONE}/openembedded ; \
+	  git fetch ; \
+	  git checkout ${FSO_STABLE_BRANCH} ; \
+	  git reset --hard ${FSO_STABLE_VERSION} )
+
 .PHONY: status-common
 status-common: common/.git/config
 	( cd common ; git diff --stat )
-- 
2.11.4.GIT