From 5ff4e87d2fb334d0cbde7b16c043aba288777834 Mon Sep 17 00:00:00 2001
From: Mike Westerhof <mwester@dls.net>
Date: Thu, 12 Nov 2009 22:15:16 -0600
Subject: [PATCH] Makefile: use the git repo for bitbake, and update to 1.8.18

---
 Makefile | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index de05095..0f233c8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ HOST_MACHINE:=$(shell uname -m | sed \
 	-e 's/armv5b/armeb/' \
 	)
 
-BITBAKE_VERSION = tags/bitbake-1.8.12
+BITBAKE_BRANCH = 1.8
+BITBAKE_VERSION = 1.8.18
 
 .PHONY: all
 all: update build
@@ -74,7 +75,7 @@ prefetch-unslung-%-beta: releases/unslung-%-beta/.configured
 	( cd releases/unslung-$*-beta ; ${MAKE} prefetch )
 
 .PHONY: prefetch-%
-prefetch-%: %/.configured bitbake/.svn/entries openembedded/.git/config
+prefetch-%: %/.configured bitbake/.git/config openembedded/.git/config
 	( cd $* ; ${MAKE} prefetch )
 
 .PHONY: unslung unslung-image
@@ -83,13 +84,13 @@ unslung unslung-image: unslung/.configured
 	  ${MAKE} -k image )
 
 .PHONY: slugosbe slugosbe-image
-slugosbe slugosbe-image: slugos/.configured bitbake/.svn/entries openembedded/.git/config
+slugosbe slugosbe-image: slugos/.configured bitbake/.git/config openembedded/.git/config
 	( cd slugos ; \
 	  ${MAKE} setup-machine-nslu2be setup-distro-slugos setup-image-slugos-image ; \
 	  ${MAKE} -k image )
 
 .PHONY: slugosle slugosle-image
-slugosle slugosle-image: slugos/.configured bitbake/.svn/entries openembedded/.git/config
+slugosle slugosle-image: slugos/.configured bitbake/.git/config openembedded/.git/config
 	( cd slugos ; \
 	  ${MAKE} setup-machine-nslu2le setup-distro-slugos setup-image-slugos-image ; \
 	  ${MAKE} -k image )
@@ -104,13 +105,13 @@ unslung-packages: unslung/.configured
 	  ${MAKE} -k distro )
 
 .PHONY: slugosbe-packages
-slugosbe-packages: slugos/.configured bitbake/.svn/entries openembedded/.git/config
+slugosbe-packages: slugos/.configured bitbake/.git/config openembedded/.git/config
 	( cd slugos ; \
 	  ${MAKE} setup-machine-nslu2be setup-distro-slugos setup-image-slugos-image setup-packages-slugos-packages ; \
 	  ${MAKE} -k distro )
 
 .PHONY: slugosle-packages
-slugosle-packages: slugos/.configured bitbake/.svn/entries openembedded/.git/config
+slugosle-packages: slugos/.configured bitbake/.git/config openembedded/.git/config
 	( cd slugos ; \
 	  ${MAKE} setup-machine-nslu2le setup-distro-slugos setup-image-slugos-image setup-packages-slugos-packages ; \
 	  ${MAKE} -k distro )
@@ -120,7 +121,7 @@ openwrt-packages: openwrt/.svn/entries
 	( cd openwrt ; ${MAKE} -k world )
 
 .PHONY: %-packages
-%-packages: %/.configured bitbake/.svn/entries openembedded/.git/config
+%-packages: %/.configured bitbake/.git/config openembedded/.git/config
 	( cd $* ; ${MAKE} -k distro)
 
 .PHONY: openwrt-index
@@ -128,7 +129,7 @@ openwrt-index: openwrt/.svn/entries
 	( cd openwrt ; ${MAKE} -k package/index )
 
 .PHONY: %-index
-%-index: %/.configured bitbake/.svn/entries openembedded/.git/config
+%-index: %/.configured bitbake/.git/config openembedded/.git/config
 	( cd $* ; ${MAKE} -k index)
 
 .PHONY: optware
@@ -209,11 +210,15 @@ setup-common common/.git/config:
 	touch common/.git/config
 
 .PHONY: setup-bitbake
-.PRECIOUS: bitbake/.svn/entries
-setup-bitbake bitbake/.svn/entries:
-	[ -e bitbake/.svn/entries ] || \
-	( svn co svn://svn.berlios.de/bitbake/${BITBAKE_VERSION} bitbake )
-	touch bitbake/.svn/entries
+.PRECIOUS: bitbake/.git/config
+setup-bitbake bitbake/.git/config:
+	[ -d bitbake/.svn ] && \
+	  mv bitbake bitbake_svn_obsolete
+	[ -e bitbake/.git/config ] || \
+	( git clone git://git.openembedded.org/bitbake bitbake ; \
+	  cd bitbake && \
+	  git checkout -b ${BITBAKE_BRANCH} --track origin/${BITBAKE_BRANCH} && \
+	  git checkout ${BITBAKE_VERSION} )
 
 .PHONY: setup-openembedded
 .PRECIOUS: openembedded/.git/config
@@ -510,8 +515,11 @@ update-common: common/.git/config
 	( cd common ; git pull )
 
 .PHONY: update-bitbake
-update-bitbake: bitbake/.svn/entries
-	( cd bitbake ; svn up )
+update-bitbake: bitbake/.git/config
+	( cd bitbake && \
+	  git checkout ${BITBAKE_BRANCH} && \
+	  git pull && \
+	  git checkout ${BITBAKE_VERSION} )
 
 .PHONY: update-openembedded
 update-openembedded: openembedded/.git/config
@@ -547,8 +555,8 @@ status-common: common/.git/config
 	( cd common ; git diff --stat )
 
 .PHONY: status-bitbake
-status-bitbake: bitbake/.svn/entries
-	( cd bitbake ; svn status )
+status-bitbake: bitbake/.git/config
+	( cd bitbake ; git diff --stat )
 
 .PHONY: status-openembedded
 status-openembedded: openembedded/.git/config
-- 
2.11.4.GIT