From: S.Çağlar Onur Date: Tue, 25 Jan 2011 19:51:02 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/build X-Git-Tag: 5.0-rc18~50 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c4736723ef4d1ef229f021306c4fcc059623a62;p=build.git Merge branch 'master' of ssh://git.planet-lab.org/git/build --- 9c4736723ef4d1ef229f021306c4fcc059623a62 diff --cc onelab-k32-tags.mk index 08235c87,78de7e76..ec9c0e6b --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@@ -2,12 -2,13 +2,13 @@@ ### linux-2.6-BRANCH := rhel6 - linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-9 + linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@rhel6 # spec2make does not know how to interpret that #kernel-RPMFLAGS += --without debug + kernel-DEVEL-RPMS += elfutils-libelf-devel madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2 iptables-BUILD-FROM-SRPM := yes # tmp -iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.9-1 +iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-0 iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0 ### diff --cc planetlab-k32-tags.mk index 7f69b883,5b36fc1c..65ea0531 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@@ -3,8 -3,9 +3,9 @@@ mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-0 linux-2.6-BRANCH := rhel6 linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-9 + kernel-DEVEL-RPMS += elfutils-libelf-devel madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-4132-2 -iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.9-1 +iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-0 iptables-BUILD-FROM-SRPM := yes # tmp iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0