From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 9 Jul 2005 08:38:40 +0000 (+0000)
Subject: Fixed the update-openembedded target so that it could handle multiple heads
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~153^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8aee402b8b06dda6a228cb48de7c9f111c614baf;p=openembedded.git

Fixed the update-openembedded target so that it could handle multiple heads
---

diff --git a/Makefile b/Makefile
index 7d0b05ca15..302d404aec 100644
--- a/Makefile
+++ b/Makefile
@@ -77,10 +77,10 @@ update-bitbake: bitbake/bin/bitbake
 .PHONY: update-openembedded
 update-openembedded: openembedded/conf/machine/nslu2.conf
 	monotone pull
-	( cd openembedded ; monotone update )
 	if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \
 	  monotone merge -b org.openembedded.nslu2-linux ; \
 	fi
+	( cd openembedded ; monotone update )
 
 .PHONY: update-oe-symlinks
 update-oe-symlinks: oe-symlinks/packages