From 9a111caf9bb8b744c7d88298407997fc992ac875 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> Date: Tue, 7 Jun 2011 15:04:19 +0200 Subject: [PATCH] clean up the onelab distro and drop support for k22 --- onelab-k27-tags.mk | 7 +------ onelab-k32-tags.mk | 8 ++------ onelab.mk | 4 ++++ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index 123e6bdf..43281bc4 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -4,19 +4,14 @@ linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-35 madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2 iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-4 -iptables-BUILD-FROM-SRPM := yes # tmp -iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.onelab.eu/iproute2.git@master ### ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-20 ### comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6 -### -util-vserver-BUILD-FROM-SRPM := yes # tmp util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-16 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 -# as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26 nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-8 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 @@ -40,7 +35,7 @@ PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 ### pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1 -ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2 +ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-10 oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.5.1-1 ### diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index 4797fc8a..31a8e989 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -8,21 +8,17 @@ ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)" kernel-WHITELIST-RPMS := kernel-devel,kernel-headers endif 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.10-4 -iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.onelab.eu/iproute2.git@master ### ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-20 ### comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6 -### -util-vserver-BUILD-FROM-SRPM := yes # tmp util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-16 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 -# as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26 nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-8 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 @@ -55,7 +51,7 @@ sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-12 nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10 -pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-9 +pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-9 bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-10 vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6 bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@master diff --git a/onelab.mk b/onelab.mk index 70562465..77eee5c8 100644 --- a/onelab.mk +++ b/onelab.mk @@ -110,6 +110,7 @@ ALL += umts-frontend # 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 @@ -119,6 +120,7 @@ IN_BOOTSTRAPFS += iptables # iproute-MODULES := iproute2 iproute-SPEC := iproute.spec +iproute-BUILD-FROM-SRPM := yes ALL += iproute IN_BOOTSTRAPFS += iproute IN_VSERVER += iproute @@ -129,6 +131,8 @@ IN_BOOTCD += iproute # util-vserver-MODULES := util-vserver util-vserver-SPEC := util-vserver.spec +# starting with 0.4 +util-vserver-BUILD-FROM-SRPM := yes util-vserver-RPMFLAGS:= --without dietlibc --without doc ALL += util-vserver IN_BOOTSTRAPFS += util-vserver -- 2.47.0