From 6a583ea8e9e9a3c40dc6fc475b27ca497317a4e5 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 14 Jun 2010 10:19:21 +0200 Subject: [PATCH] synced with onelab --- wextoolbox-tags.mk | 65 +++++++++++++++++++++++++++------------------- wextoolbox.mk | 39 ++++++++++++++++------------ 2 files changed, 60 insertions(+), 44 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index a30cb2c..bca149c 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -1,3 +1,5 @@ +# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication + 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 @@ -8,47 +10,56 @@ spectools-GITPATH := git://git.onelab.eu/spectools@spectools-2009_06_R1-1 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication -linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-9 +### +linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-13 madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0 -iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.7-2 +iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.8-0 iptables-BUILD-FROM-SRPM := yes # tmp iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2 -ipfw-SVNPATH := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-12 -util-vserver-SVNBRANCH := scholz -util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 +### +ipfw-SVNPATH := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-15 +### +util-vserver-BUILD-FROM-SRPM := yes # tmp +util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.216-3 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 -util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-23 -NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 +# 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-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-10 +NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-6 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-14 -fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2 +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-SVNBRANCH := 0.9 -vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 -vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-15 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-8 +vsys-BRANCH := 0.9 +vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 +vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/trunk drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 -PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-43 +PLEWWW-GITPATH := git://git.onelab.eu/plewww@PLEWWW-4.3-44 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3 -pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-32 +pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-4 +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-SVNPATH := http://svn.planet-lab.org/svn/pyaspects/tags/pyaspects-0.3-1 -sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10 -nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2 -BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3 -pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 -pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5 -BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-2 -VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-2 -BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-4 -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-3 +ejabberd-SVNPATH := http://svn.planet-lab.org/svn/ejabberd/tags/ejabberd-2.1.3-1 +omf-GITPATH := git://git.onelab.eu/omf@omf-5.3-4 +### +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-13 +nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2 +BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-3 +pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 +pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-6 +BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-2 +VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-2 +BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-5 +MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk +DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 -# locating the right test directory - see make tests_svnpath -tests-GITPATH := git://git.onelab.eu/tests@master +# locating the right test directory - see make tests_gitpath +tests-GITPATH := git://git.onelab.eu/tests.git@master diff --git a/wextoolbox.mk b/wextoolbox.mk index 3a02818..d686c18 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -5,8 +5,6 @@ # Copyright (C) 2003-2006 The Trustees of Princeton University # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis # -# $Id$ -# ### NOTES on diffs with onelab # 2.6.27 vs 2.6.22 - does not need iwlwifi exception anymore # does not include: @@ -150,6 +148,7 @@ 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 @@ -242,7 +241,7 @@ IN_BOOTSTRAPFS += sshd # codemux-MODULES := CoDemux codemux-SPEC := codemux.spec -codemux-RPMBUILD := sudo bash ./rpmbuild.sh +#codemux-RPMBUILD := bash ./rpmbuild.sh ALL += codemux IN_BOOTSTRAPFS += codemux @@ -306,7 +305,7 @@ IN_BOOTSTRAPFS += vsys-scripts ALL += vsys-scripts # -# PLCAPI +# plcapi # plcapi-MODULES := PLCAPI plcapi-SPEC := PLCAPI.spec @@ -353,13 +352,6 @@ monitor-SPEC := Monitor.spec ALL += monitor IN_BOOTSTRAPFS += monitor -# -# PLC RT -# -plcrt-MODULES := PLCRT -plcrt-SPEC := plcrt.spec -ALL += plcrt - # # zabbix # @@ -368,6 +360,13 @@ zabbix-SPEC := zabbix.spec zabbix-BUILD-FROM-SRPM := yes ALL += zabbix +# +# PLC RT +# +plcrt-MODULES := PLCRT +plcrt-SPEC := plcrt.spec +ALL += plcrt + # # pyopenssl # @@ -384,12 +383,18 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects +# +# 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 @@ -430,7 +435,7 @@ IN_BOOTCD += pyplnet # bootcd-MODULES := BootCD build bootcd-SPEC := bootcd.spec -bootcd-RPMBUILD := sudo bash ./rpmbuild.sh +bootcd-RPMBUILD := bash ./rpmbuild.sh bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) bootcd-DEPEND-FILES := RPMS/yumgroups.xml bootcd-RPMDATE := yes @@ -453,7 +458,7 @@ IN_BOOTSTRAPFS += vserver # bootstrapfs-MODULES := BootstrapFS build bootstrapfs-SPEC := bootstrapfs.spec -bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh +bootstrapfs-RPMBUILD := bash ./rpmbuild.sh bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml bootstrapfs-RPMDATE := yes @@ -464,16 +469,16 @@ IN_MYPLC += bootstrapfs # noderepo # # all rpms resulting from packages marked as being in bootstrapfs and vserver -NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms)) +NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(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-SPEC := noderepo.spec -noderepo-RPMBUILD := sudo bash ./rpmbuild.sh -# package requires all regular packages -noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER) +noderepo-RPMBUILD := bash ./rpmbuild.sh +# package requires all embedded packages +noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER) noderepo-DEPEND-FILES := RPMS/yumgroups.xml #export rpm list to the specfile noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS) -- 2.43.0