From: Marco Yuen Date: Thu, 22 Dec 2011 15:46:14 +0000 (-0500) Subject: Merge branch 'master' into lxc_devel X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=27eb8a7156718285a99598b40d84c016e1f13dee;hp=28ddc9b66fe43e83c2e4afcf8d9eb5d4718e8f01;p=build.git Merge branch 'master' into lxc_devel Conflicts: planetlab-k32-tags.mk --- diff --git a/module-tools.py b/module-tools.py index 27265d31..20e78d54 100755 --- a/module-tools.py +++ b/module-tools.py @@ -1,6 +1,6 @@ #!/usr/bin/python -u -import sys, os +import sys, os, os.path import re import time import tempfile @@ -1271,7 +1271,14 @@ def release_changelog(options, buildtag_old, buildtag_new): except: print "ERROR: provide a tagfile name (eg. onelab, onelab-k27, planetlab)" return - tagfile = "%s-tags.mk" % tagfile + # mmh, sounds wrong to blindly add the extension + # if in a build directory, guess from existing files + if os.path.isfile (tagfile): + pass + elif os.path.isfile ("%s-tags.mk" % tagfile): + tagfile="%s-tags.mk" % tagfile + else: + tagfile = "%s-tags.mk" % tagfile print '----' print '----' @@ -1328,7 +1335,7 @@ def release_changelog(options, buildtag_old, buildtag_new): print ' * to', second, m.repository.gitweb() print '{{{' - os.system("diff -u %s %s" % (tmpfile, specfile)) + os.system("diff -u %s %s | sed -e 's,%s,[[previous version]],'" % (tmpfile, specfile,tmpfile)) print '}}}' os.unlink(tmpfile) @@ -1573,8 +1580,10 @@ Branches: Module.html_dump_footer() else: # if we provide, say a b c d, we want to build (a,b) (b,c) and (c,d) - for (f,t) in zip ( args[:-1], args [1:]): - release_changelog(options, f,t) + # remember that the changelog in the twiki comes latest first, so + # we typically have here latest latest-1 latest-2 + for (tag_to,tag_from) in zip ( args[:-1], args [1:]): + release_changelog(options, tag_from,tag_to) #################### diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index 61f15cdc..81dc8b70 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -2,7 +2,7 @@ ### linux-2.6-BRANCH := rhel6 -linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-27 +linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@32 # help out spec2make on f8 and centos5, due to a bug in rpm # ditto on f16 for spec2make.py - tmp hopefully ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f16 centos5)" @@ -10,7 +10,7 @@ kernel-WHITELIST-RPMS := kernel-devel,kernel-headers endif kernel-DEVEL-RPMS += elfutils-libelf-devel -madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-4 +madwifi-GITPATH := git://git.onelab.eu/madwifi.git@master iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-5 # we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel # note that this should be consistently reflected in pl_getKexcludes in build.common @@ -45,11 +45,11 @@ PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 pyopenssl-GITPATH := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2 ### pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-2 -ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2 +ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@master omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### -sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-2.0-4 +sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-2.0-6 sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.9-0 nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@lxcbuild diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index 2bdba312..db3919fc 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -35,7 +35,7 @@ pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2 ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.0-4 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.0-6 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5 pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10 pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-11 @@ -47,4 +47,4 @@ vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.gi bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-13 myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-19 # locating the right test directory - see make tests_gitpath -tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-32 +tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-34 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index 753d2dad..747c1e12 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -45,7 +45,7 @@ pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2 ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.0-4 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.0-6 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-0 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@lxcbuild