From 5feab256cf54100e79ec42413d2adeb94bd8c428 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 25 Jan 2011 12:33:45 +0100 Subject: [PATCH] catching up with onelab --- devel.pkgs | 2 - wextoolbox-tags.mk | 94 +++++++++++---------- wextoolbox.mk | 205 ++++++++++++++++----------------------------- 3 files changed, 121 insertions(+), 180 deletions(-) diff --git a/devel.pkgs b/devel.pkgs index 9dc4929..454d26c 100644 --- a/devel.pkgs +++ b/devel.pkgs @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ # groupname: PlanetLabDevel groupdesc: Building PlanetLab diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 72da12b..41a94ef 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -1,66 +1,74 @@ -# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication +# $Id: wextoolbox-tags.mk 1756 2010-05-25 05:36:17Z thierry $ +# $URL: svn+ssh://thierry@svn.onelab.eu/svn/wextoolbox/trunk/wextoolbox-tags.mk $ -boost-GITPATH := git://git.onelab.eu/boost@boost-1.37.0-6 -gnuradio-GITPATH := git://git.onelab.eu/gnuradio -bbn_80211-GITPATH := git://git.onelab.eu/bbn_80211@bbn_80211-3.2.2-3 -crunchxml-GITPATH := git://git.onelab.eu/crunchxml@crunchxml-1.1-1 -spectools-GITPATH := git://git.onelab.eu/spectools@spectools-2009_06_R1-1 +boost-SVNPATH := http://svn.onelab.eu/boost/tags/boost-1.37.0-6 +gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/trunk +bbn_80211-SVNPATH := http://svn.onelab.eu/bbn_80211/tags/bbn_80211-3.2.2-3 +crunchxml-SVNPATH := http://svn.onelab.eu/crunchxml/tags/crunchxml-1.1-1 +spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1 #turned off -#sge-GITPATH := git://git.onelab.eu/sge/tags/sge-6.2.3-1 +#sge-SVNPATH := http://svn.onelab.eu/sge/tags/sge-6.2.3-1 +#sge-SVNPATH := http://svn.onelab.eu/sge/trunk -# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication - -### -linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-29 -madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0 -iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.9-0 +linux-2.6-BRANCH := rhel6 +linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@rhel6 +madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2 iptables-BUILD-FROM-SRPM := yes # tmp -iproute-BUILD-FROM-SRPM := yes -iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.33-2 -### -ipfw-GITPATH := git://git.onelab.eu/ipfw@ipfw-0.9-17 +iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.9-1 +iproute-BUILD-FROM-SRPM := yes +iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0 ### -util-vserver-BUILD-FROM-SRPM := yes # tmp -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-7 +ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-20 +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-11 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 (trunk). -util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-20 +# 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-21 nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-21 +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-25 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 -codemux-GITPATH := git://git.onelab.eu/codemux.git@CoDemux-0.1-14 +codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2 pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 -vsys-BRANCH := 0.9 -vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.9-5 -vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25 -plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-18 +#openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@master +vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-0 +vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@master +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-25 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14 -plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-54 +plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-58 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5 -pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-8 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35 -PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 +pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10 +#Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35 +#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-0 -ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1 -omf-GITPATH := git://git.onelab.eu/omf.git@master +pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1 +omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-9 ### -sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-1.0-8 +#sfa-GITPATH := git://git.onelab.eu/sfa.git@master sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-3 -nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-3 -bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-12 +nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-4 +bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-16 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9 -pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-6 -bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-5 -vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@VserverReference-5.0-3 -bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@BootstrapFS-2.0-6 -myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-11 -DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 +pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-8 +bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-7 +vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6 +bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-7 +myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-13 +#DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.onelab.eu/tests.git@master + +# locating the right test directory - see make tests_svnpath +tests-GITPATH := git://git.onelab.eu/tests@master + +### temporary +# nozomi not needed anymore for 2.6.27 +ALL:=$(subst nozomi,,$(ALL)) +IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS)) diff --git a/wextoolbox.mk b/wextoolbox.mk index e91e8a4..0f1eaaf 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -5,6 +5,8 @@ # Copyright (C) 2003-2006 The Trustees of Princeton University # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis # +# $Id: wextoolbox.mk 1696 2010-04-26 19:18:48Z thierry $ +# ### NOTES on diffs with onelab # 2.6.27 vs 2.6.22 - does not need iwlwifi exception anymore # does not include: @@ -20,28 +22,29 @@ # see doc in Makefile # -# -# boost -# -# we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35 -# this build is based on the f11 rpm, i.e. boost-1.37 -# -boost-MODULES := boost -boost-SPEC := boost.spec -boost-BUILD-FROM-SRPM := yes -ALL += boost -IN_BOOTSTRAPFS += boost - -# -# gnuradio -# -gnuradio-MODULES := gnuradio -gnuradio-SPEC := gnuradio.spec -gnuradio-BUILD-FROM-SRPM := yes -# boost-devel needs boost ! -gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel -ALL += gnuradio -IN_BOOTSTRAPFS += gnuradio +########## this should not be needed with f14 anymore +#f14# # +#f14# # boost +#f14# # +#f14# # we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35 +#f14# # this build is based on the f11 rpm, i.e. boost-1.37 +#f14# # +#f14# boost-MODULES := boost +#f14# boost-SPEC := boost.spec +#f14# boost-BUILD-FROM-SRPM := yes +#f14# ALL += boost +#f14# IN_BOOTSTRAPFS += boost +#f14# +#f14# # +#f14# # gnuradio +#f14# # +#f14# gnuradio-MODULES := gnuradio +#f14# gnuradio-SPEC := gnuradio.spec +#f14# gnuradio-BUILD-FROM-SRPM := yes +#f14# # boost-devel needs boost ! +#f14# gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel +#f14# ALL += gnuradio +#f14# IN_BOOTSTRAPFS += gnuradio # # bbn @@ -97,8 +100,9 @@ kernel-RPMFLAGS:= --target i686 else kernel-RPMFLAGS:= --target $(HOSTARCH) endif -### not needed with 2.6.27 anymore -### kernel-SPECVARS := iwlwifi=1 +# this is useful for 2.6.22 but will not be needed anymore with 2.6.27 +kernel-SPECVARS += iwlwifi=1 +kernel-SPECVARS += kernelconfig=planetlab KERNELS += kernel kernels: $(KERNELS) @@ -109,26 +113,6 @@ ALL += $(KERNELS) IN_BOOTCD += $(KERNELS) IN_VSERVER += $(KERNELS) IN_BOOTSTRAPFS += $(KERNELS) -# turns out myplc installs kernel-vserver -IN_MYPLC += $(KERNELS) - -#-broken-# # -#-broken-# # ipfw: root context module, and slice companion -#-broken-# # -#-broken-# ipfwroot-MODULES := ipfw -#-broken-# ipfwroot-SPEC := planetlab/ipfwroot.spec -#-broken-# ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel -#-broken-# ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \ -#-broken-# kernel_release=$(kernel.rpm-release) \ -#-broken-# kernel_arch=$(kernel.rpm-arch) -#-broken-# ALL += ipfwroot -#-broken-# -#-broken-# ipfwslice-MODULES := ipfw -#-broken-# ipfwslice-SPEC := planetlab/ipfwslice.spec -#-broken-# ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \ -#-broken-# kernel_release=$(kernel.rpm-release) \ -#-broken-# kernel_arch=$(kernel.rpm-arch) -#-broken-# ALL += ipfwslice # # madwifi @@ -148,7 +132,6 @@ IN_BOOTSTRAPFS += madwifi # 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 @@ -163,6 +146,40 @@ IN_BOOTSTRAPFS += iproute IN_VSERVER += iproute IN_BOOTCD += iproute +# +# ipfw: root context module, and slice companion +# +ipfwroot-MODULES := ipfw +ipfwroot-SPEC := planetlab/ipfwroot.spec +ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel +ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \ + kernel_release=$(kernel.rpm-release) \ + kernel_arch=$(kernel.rpm-arch) +ALL += ipfwroot + +ipfwslice-MODULES := ipfw +ipfwslice-SPEC := planetlab/ipfwslice.spec +ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \ + kernel_release=$(kernel.rpm-release) \ + kernel_arch=$(kernel.rpm-arch) +ALL += ipfwslice + +# +# umts: root context stuff +# +umts-backend-MODULES := planetlab-umts-tools +umts-backend-SPEC := backend.spec +IN_BOOTSTRAPFS += umts-backend +ALL += umts-backend + +# +# umts: slice tools +# +umts-frontend-MODULES := planetlab-umts-tools +umts-frontend-SPEC := frontend.spec +IN_VSERVER += umts-frontend +ALL += umts-frontend + # # util-vserver # @@ -223,7 +240,7 @@ IN_BOOTSTRAPFS += ipod # # NodeManager # -nodemanager-MODULES := nodemanager +nodemanager-MODULES := NodeManager nodemanager-SPEC := NodeManager.spec ALL += nodemanager IN_BOOTSTRAPFS += nodemanager @@ -239,9 +256,8 @@ IN_BOOTSTRAPFS += sshd # # codemux: Port 80 demux # -codemux-MODULES := codemux +codemux-MODULES := CoDemux codemux-SPEC := codemux.spec -#codemux-RPMBUILD := bash ./rpmbuild.sh ALL += codemux IN_BOOTSTRAPFS += codemux @@ -305,7 +321,7 @@ IN_BOOTSTRAPFS += vsys-scripts ALL += vsys-scripts # -# plcapi +# PLCAPI # plcapi-MODULES := plcapi plcapi-SPEC := PLCAPI.spec @@ -344,29 +360,6 @@ pcucontrol-MODULES := pcucontrol pcucontrol-SPEC := pcucontrol.spec ALL += pcucontrol -# -# monitor -# -monitor-MODULES := Monitor -monitor-SPEC := Monitor.spec -ALL += monitor -IN_BOOTSTRAPFS += monitor - -# -# zabbix -# -zabbix-MODULES := Monitor -zabbix-SPEC := zabbix.spec -zabbix-BUILD-FROM-SRPM := yes -ALL += zabbix - -# -# PLC RT -# -plcrt-MODULES := PLCRT -plcrt-SPEC := plcrt.spec -ALL += plcrt - # # pyopenssl # @@ -383,26 +376,6 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects -# -# ejabberd -# -ejabberd-MODULES := ejabberd -ejabberd-SPEC := ejabberd.spec -ejabberd-BUILD-FROM-SRPM := yes -ALL += ejabberd - -# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ -build_sfa=false - -ifeq "$(build_sfa)" "true" -# -# sfa - Slice Facility Architecture -# -sfa-MODULES := sfa -sfa-SPEC := sfa.spec -ALL += sfa -endif - # # nodeconfig # @@ -437,27 +410,11 @@ IN_BOOTSTRAPFS += pyplnet IN_MYPLC += pyplnet IN_BOOTCD += pyplnet -# -# OMF resource controller -# -omf-resctl-MODULES := omf -omf-resctl-SPEC := omf-resctl.spec -ALL += omf-resctl -IN_VSERVER += omf-resctl - -# -# OMF exp controller -# -omf-expctl-MODULES := omf -omf-expctl-SPEC := omf-expctl.spec -ALL += omf-expctl - # # bootcd # bootcd-MODULES := bootcd build bootcd-SPEC := bootcd.spec -bootcd-RPMBUILD := bash ./rpmbuild.sh bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) bootcd-DEPEND-FILES := RPMS/yumgroups.xml bootcd-RPMDATE := yes @@ -480,7 +437,6 @@ IN_BOOTSTRAPFS += vserver # bootstrapfs-MODULES := bootstrapfs build bootstrapfs-SPEC := bootstrapfs.spec -bootstrapfs-RPMBUILD := bash ./rpmbuild.sh bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml bootstrapfs-RPMDATE := yes @@ -491,16 +447,15 @@ IN_MYPLC += bootstrapfs # noderepo # # all rpms resulting from packages marked as being in bootstrapfs and vserver -NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms)) +NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms)) # replace space with +++ (specvars cannot deal with spaces) SPACE=$(subst x, ,x) NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS)) -noderepo-MODULES := bootstrapfs +noderepo-MODULES := bootstrapfs noderepo-SPEC := noderepo.spec -noderepo-RPMBUILD := bash ./rpmbuild.sh -# package requires all embedded packages -noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER) +# package requires all regular packages +noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER) noderepo-DEPEND-FILES := RPMS/yumgroups.xml #export rpm list to the specfile noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS) @@ -508,26 +463,6 @@ noderepo-RPMDATE := yes ALL += noderepo IN_MYPLC += noderepo -# -# slicerepo -# -# all rpms resulting from packages marked as being in vserver -SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms)) -# replace space with +++ (specvars cannot deal with spaces) -SPACE=$(subst x, ,x) -SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS)) - -slicerepo-MODULES := bootstrapfs -slicerepo-SPEC := slicerepo.spec -slicerepo-RPMBUILD := bash ./rpmbuild.sh -# package requires all embedded packages -slicerepo-DEPEND-PACKAGES := $(IN_VSERVER) -slicerepo-DEPEND-FILES := RPMS/yumgroups.xml -#export rpm list to the specfile -slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS) -slicerepo-RPMDATE := yes -ALL += slicerepo - # # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver # @@ -539,7 +474,7 @@ ALL += myplc # myplc-docs only contains docs for PLCAPI and NMAPI, but # we still need to pull MyPLC, as it is where the specfile lies, # together with the utility script docbook2drupal.sh -myplc-docs-MODULES := myplc plcapi nodemanager Monitor +myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor myplc-docs-SPEC := myplc-docs.spec ALL += myplc-docs -- 2.43.0