From: Baris Metin Date: Wed, 13 Apr 2011 15:17:51 +0000 (-0400) Subject: Merge branch 'master' of git.verivue.com:/git/planetlab/build X-Git-Tag: 5.0-rc23~77 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=397fc58ed88b8131d977883b0ae441e6895eea4e;p=build.git Merge branch 'master' of git.verivue.com:/git/planetlab/build --- 397fc58ed88b8131d977883b0ae441e6895eea4e diff --cc coblitz-latest-tags.mk index eb4a10b3,329f17d1..b128cef7 --- a/coblitz-latest-tags.mk +++ b/coblitz-latest-tags.mk @@@ -33,14 -33,13 +33,21 @@@ bootstrapfs-GITPATH := git: myplc-GITPATH := git://git.verivue.com/planetlab/myplc@myplc-4.3-50 pyopenssl-GITPATH := git://git.verivue.com/planetlab/pyopenssl.git@pyopenssl-0.9-1 monitor-GITPATH := git://git.verivue.com/planetlab/monitor.git@Monitor-3.0-29 +pyaspects-GITPATH := git://git.verivue.com/planetlab/pyaspects.git@pyaspects-0.4.1-1 + +ifeq "$(DISTRONAME)" "centos5" +yum-SVNPATH := http://svn.planet-lab.org/svn/yum/branches/centos5 +endif +ifeq "$(DISTRONAME)" "sl6" +yum-SVNPATH := http://svn.planet-lab.org/svn/yum/branches/rhel6 +endif + ifeq "$(DISTRONAME)" "centos5" + yum-SVNPATH := http://svn.planet-lab.org/svn/yum/branches/centos5 + endif + ifeq "$(DISTRONAME)" "sl6" + yum-SVNPATH := http://svn.planet-lab.org/svn/yum/branches/rhel6 + endif + # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.verivue.com/tests.git@verivue