From: S.Çağlar Onur Date: Wed, 12 Jan 2011 23:02:08 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/build X-Git-Tag: 5.0-rc18~101^2~4 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=710c3138fbe52771cc7f027e96ac5aaeee7a7be9;p=build.git Merge branch 'master' of ssh://git.planet-lab.org/git/build --- 710c3138fbe52771cc7f027e96ac5aaeee7a7be9 diff --cc planetlab-k32-tags.mk index 02fe1dbe,c464a65f..a21d887e --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-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@master linux-2.6-BRANCH := rhel6 - linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-8 + linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-9 madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@master iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0 iptables-BUILD-FROM-SRPM := yes # tmp