From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 22 Jul 2005 05:25:03 +0000 (+0000)
Subject: Migrated bitbake from the unstable and three-day-downtime berlios.de SVN to our well... 
X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~138
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aaf58e549fa73565afd4f9fc86b1a288d0139c4;p=openembedded.git

Migrated bitbake from the unstable and three-day-downtime berlios.de SVN to our well-maintained nslu2-linux.org monotone repository
---

diff --git a/Makefile b/Makefile
index f9d7946f0f..13c1fb5e38 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,6 @@
 SVN_USER ?= ${USER}
 CVS_USER ?= ${USER}
 
-# Fetch this revision of BitBake. Unset this to fetch bleeding edge.
-BITBAKE_REVISION = -r 269
-
 .PHONY: all
 all: update build
 
@@ -61,7 +58,8 @@ setup-master: setup-monotone unslung/Makefile openslug/Makefile
 
 .PHONY: setup-bitbake
 setup-bitbake bitbake/bin/bitbake:
-	[ -e bitbake/bin/bitbake ] || ( svn co ${BITBAKE_REVISION} svn://svn.berlios.de/bitbake/trunk/bitbake )
+	${MAKE} MT/revision
+	[ -e bitbake/bin/bitbake ] || monotone co -b org.nslu2-linux.bitbake bitbake
 
 .PHONY: setup-openembedded
 setup-openembedded openembedded/conf/machine/nslu2.conf:
@@ -113,6 +111,9 @@ setup-apex-developer:
 .PHONY: update-master
 update-master: MT/revision
 	monotone pull
+	if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \
+	  monotone merge -b org.nslu2-linux.dev ; \
+	fi
 	monotone update
 	if [ `monotone automate heads org.nslu2-linux.dev | wc -l` != "1" ] ; then \
 	  monotone merge -b org.nslu2-linux.dev ; \
@@ -120,7 +121,14 @@ update-master: MT/revision
 
 .PHONY: update-bitbake
 update-bitbake: bitbake/bin/bitbake
-	( cd bitbake ; svn ${BITBAKE_REVISION} update )
+	monotone pull
+	if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \
+	  monotone merge -b org.nslu2-linux.bitbake ; \
+	fi
+	( cd bitbake ; monotone update )
+	if [ `monotone automate heads org.nslu2-linux.bitbake | wc -l` != "1" ] ; then \
+	  monotone merge -b org.nslu2-linux.bitbake ; \
+	fi
 
 .PHONY: update-openembedded
 update-openembedded: openembedded/conf/machine/nslu2.conf
@@ -129,6 +137,9 @@ update-openembedded: openembedded/conf/machine/nslu2.conf
 	  monotone merge -b org.openembedded.nslu2-linux ; \
 	fi
 	( cd openembedded ; monotone update )
+	if [ `monotone automate heads org.openembedded.nslu2-linux | wc -l` != "1" ] ; then \
+	  monotone merge -b org.openembedded.nslu2-linux ; \
+	fi
 
 .PHONY: update-oe-symlinks
 update-oe-symlinks: oe-symlinks/packages