From: Thierry Parmentelat Date: Thu, 9 Jun 2011 13:06:37 +0000 (+0200) Subject: cleanup planetlab X-Git-Tag: 5.0-rc22~15 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ea8baec7ed8d9a73f06f898e2f69d560f69f1815;p=build.git cleanup planetlab --- diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index 10217ef3..7df61fe9 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -3,11 +3,8 @@ linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-35 madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-4132-2 iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4 -iptables-BUILD-FROM-SRPM := yes # tmp -iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.37-1 util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-16 -util-vserver-BUILD-FROM-SRPM := yes # tmp libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26 nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-8 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index ccdb0d0c..06767c10 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -10,11 +10,8 @@ endif 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.10-4 -iptables-BUILD-FROM-SRPM := yes # tmp -iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.37-1 util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-16 -util-vserver-BUILD-FROM-SRPM := yes # tmp libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26 nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-8 diff --git a/planetlab.mk b/planetlab.mk index 1ee8b4b5..eb4043bd 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -75,6 +75,7 @@ endif # util-vserver-MODULES := util-vserver util-vserver-SPEC := util-vserver.spec +util-vserver-BUILD-FROM-SRPM := yes util-vserver-RPMFLAGS:= --without dietlibc --without doc ALL += util-vserver IN_BOOTSTRAPFS += util-vserver @@ -187,6 +188,7 @@ IN_BOOTSTRAPFS += mom # iptables-MODULES := iptables iptables-SPEC := iptables.spec +iptables-BUILD-FROM-SRPM := yes iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers ALL += iptables IN_BOOTSTRAPFS += iptables @@ -196,6 +198,7 @@ IN_BOOTSTRAPFS += iptables # iproute-MODULES := iproute2 iproute-SPEC := iproute.spec +iproute-BUILD-FROM-SRPM := yes ALL += iproute IN_BOOTSTRAPFS += iproute IN_VSERVER += iproute