summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-07-15 07:46:59 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-15 07:46:59 +0000
commit69742294e28c27ddc29052c591fe6272284e4065 (patch)
tree9be9c5aeeed882517cd4673bd511669796639d3a /Makefile
parent2a45b8e3189c9d18afeffb7c09a7e58645a8b942 (diff)
Updated for monotone 0.20
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
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 \