From: Rod Whitby Date: Fri, 15 Jul 2005 07:46:59 +0000 (+0000) Subject: Updated for monotone 0.20 X-Git-Tag: Release-2010-05/1~9453^2~2960^2^2~9^2~2^2~3^2^2~4^2~143 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69742294e28c27ddc29052c591fe6272284e4065;p=openembedded.git Updated for monotone 0.20 --- diff --git a/Makefile b/Makefile index 5798604670..293c44dc8d 100644 --- a/Makefile +++ b/Makefile @@ -41,10 +41,10 @@ optware build-optware: optware/Makefile .PHONY: setup-monotone setup-monotone monotone/nslu2-linux.db: [ -e monotone/nslu2-linux.db ] || ( mkdir -p monotone && monotone -d monotone/nslu2-linux.db db init ) - ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded ) + ( monotone -d monotone/nslu2-linux.db pull monotone.vanille.de org.openembedded.* ) ( monotone -d monotone/nslu2-linux.db unset database default-server ) - ( monotone -d monotone/nslu2-linux.db unset database default-collection ) - ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org ) + ( monotone -d monotone/nslu2-linux.db unset database default-include-pattern ) + ( monotone -d monotone/nslu2-linux.db pull monotone.nslu2-linux.org org.openembedded.* org.nslu2-linux.* ) downloads: [ -e downloads ] || mkdir -p downloads @@ -159,7 +159,7 @@ upload-openslug-cross: openslug/Makefile .PHONY: import-openembedded import-openembedded: openembedded/conf/machine/nslu2.conf - monotone pull monotone.vanille.de org.openembedded + monotone pull monotone.vanille.de org.openembedded.* if [ `monotone automate heads org.openembedded.dev | wc -l` != "1" ] ; then \ monotone merge -b org.openembedded.dev ; \ fi @@ -180,7 +180,7 @@ propagate-to-oe: .PHONY: export-openembedded export-openembedded: openembedded/conf/machine/nslu2.conf - monotone push monotone.vanille.de org.openembedded + monotone push monotone.vanille.de org.openembedded.* .PHONY: publish-openembedded publish-openembedded: import-openembedded propagate-from-oe update-openembedded \