From: S.Çağlar Onur Date: Sat, 9 Apr 2011 16:13:46 +0000 (-0400) Subject: merge from PL X-Git-Tag: 5.0-rc23~84^2~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7176273f49c1cb10a3c13b5d799f581e8db38245;hp=366c7b39d7f594d570fada59a8d452e476511a88;p=build.git merge from PL --- diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk index 303c481a..0d916627 100644 --- a/coblitz-latest-tags.mk +++ b/coblitz-latest-tags.mk @@ -2,9 +2,9 @@ mkinitrd-GITPATH := git://git.verivue.com/planetlab/mkinitrd.git@mkinitrd-5.1.19.6-3 linux-2.6-BRANCH := rhel6 -linux-2.6-GITPATH := git://git.verivue.com/planetlab/linux-2.6.git@linux-2.6-32-15 -madwifi-GITPATH := git://git.verivue.com/planetlab/madwifi.git@madwifi-4132-2 -util-vserver-GITPATH := git://git.verivue.com/planetlab/util-vserver.git@util-vserver-0.30.216-15 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-16 +madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-4132-2 +util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-15 util-vserver-BUILD-FROM-SRPM := yes # tmp util-vserver-pl-GITPATH := git://git.verivue.com/planetlab/util-vserver-pl.git@util-vserver-pl-0.4-25 libnl-GITPATH := git://git.verivue.com/planetlab/libnl.git@libnl-1.1-2 diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index 5824850e..713a3254 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.planet-lab.org/linux-2.6.git@linux-2.6-32-15 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-16 # help out spec2make on f8 and centos5, due to a bug in rpm ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)" kernel-WHITELIST-RPMS := kernel-devel,kernel-headers diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index e103bf17..2c3ae630 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -2,7 +2,7 @@ mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2 linux-2.6-BRANCH := rhel6 -linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-15 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-16 # help out spec2make on f8 and centos5, due to a bug in rpm ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)" kernel-WHITELIST-RPMS := kernel-devel,kernel-headers