From: S.Çağlar Onur Date: Mon, 10 Jan 2011 17:41:37 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/build X-Git-Tag: 5.0-rc18~114 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=97375a170c40251da0505dbe5d609018b98cbf15;p=build.git Merge branch 'master' of ssh://git.planet-lab.org/git/build --- 97375a170c40251da0505dbe5d609018b98cbf15 diff --cc coblitz-latest-tags.mk index bba214a6,5f04ee2d..361d2639 --- a/coblitz-latest-tags.mk +++ b/coblitz-latest-tags.mk @@@ -1,8 -1,7 +1,8 @@@ # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication +mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@trunk linux-2.6-BRANCH := rhel6 - linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-6 + linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-7 madwifi-BRANCH := 0.9.4 madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-0.9.4-3 util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-10