From 4a80c37df7dd11b16aed28a93956fac031f5f510 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 15 Dec 2009 20:53:09 +0000 Subject: [PATCH] messing for f12 --- onelab-k27-tags.mk | 18 +++++++----------- onelab-tags.mk | 2 +- onelab.mk | 4 ++++ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index 17d15560..dc15ed9c 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -3,17 +3,13 @@ # 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/trunk -ipfw-SVNPATH := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-7 -# hack: ipfw needs changes for 2.6.27 -ALL:=$(subst ipfwslice,,$(ALL)) -IN_VSERVER:=$(subst ipfwslice,,$(IN_VSERVER)) -ALL:=$(subst ipfw,,$(ALL)) -IN_BOOTSTRAPFS:=$(subst ipfw,,$(IN_BOOTSTRAPFS)) +# this should build +ipfwsrc-SVNPATH := http://svn.planet-lab.org/svn/ipfw/trunk madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0 -# hack: nozomi needs changes for 2.6.27 +# nozomi not needed anymore for 2.6.27 ALL:=$(subst nozomi,,$(ALL)) IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS)) -nozomi-SVNPATH := http://svn.onelab.eu/nozomi/tags/nozomi-2.21-1 +# comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 planetlab-umts-tools-SVNPATH := http://svn.onelab.eu/planetlab-umts-tools/tags/planetlab-umts-tools-0.6-4 util-vserver-SVNBRANCH := scholz @@ -33,10 +29,10 @@ iptables-SVNPATH := http://svn.planet-lab.org/svn//iptables/tags/iptables-1.4.1 iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-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-3 +vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/branches/0.9 vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-12 dummynet_image-SVNPATH := http://svn.planet-lab.org/svn/dummynet_image/tags/dummynet_image-1.0-5 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-30 +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-39 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 @@ -48,7 +44,7 @@ BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-15 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-10 MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-32 -sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-6 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/trunk pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 diff --git a/onelab-tags.mk b/onelab-tags.mk index 8091f82c..7e8cd10e 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -17,7 +17,7 @@ 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-19 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 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-1.8-20 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 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-13 diff --git a/onelab.mk b/onelab.mk index be3b358a..e7f9425d 100644 --- a/onelab.mk +++ b/onelab.mk @@ -58,6 +58,9 @@ ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_arch=$(kernel.rpm-arch) ALL += ipfwslice +# this doesn't build on f12 - weird all right - I suspect gcc to be smarter but that needs investigation +# is madwifi still current anyway ? should we move to ath5k instead ? +ifneq "$(DISTRONAME)" "f12" # # madwifi # @@ -70,6 +73,7 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_arch=$(kernel.rpm-arch) ALL += madwifi IN_BOOTSTRAPFS += madwifi +endif # # nozomi -- 2.43.0