From f2bbee15652ac5bef0ab819a9983ca2cc2bab00c Mon Sep 17 00:00:00 2001 From: thierry Date: Tue, 12 May 2009 12:48:11 +0000 Subject: [PATCH] cleanup monitor, use stable 4.3 tags + the new 64bits patch --- gnuradio-tags.mk | 69 +++++++++++++++++++++++++----------------------- gnuradio.mk | 30 ++++++++++----------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/gnuradio-tags.mk b/gnuradio-tags.mk index 17263aa..0658587 100644 --- a/gnuradio-tags.mk +++ b/gnuradio-tags.mk @@ -2,38 +2,41 @@ # 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-2 -madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/trunk -nozomi-SVNPATH := http://svn.onelab.eu/nozomi/trunk -comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 +# trying the 2.6.27 kernel +linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-3 +madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0 util-vserver-SVNBRANCH := scholz -util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/branches/scholz -libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/trunk -util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/trunk -NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/trunk -PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/trunk -NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/trunk -pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/trunk -pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/trunk -CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/trunk -fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/trunk -pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/trunk -Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/trunk -iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/trunk -iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/trunk -inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/trunk -vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/trunk -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/trunk -drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/trunk -PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/trunk -www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/trunk -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/branches/2.0 -nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/trunk -BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/trunk -pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/trunk -BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/trunk -VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/trunk -BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/trunk -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk +util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 +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-16 +NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn//NodeUpdate/tags/NodeUpdate-0.5-4 +PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn//PingOfDeath/tags/PingOfDeath-2.2-1 +NodeManager-SVNBRANCH := 1.8 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn//NodeManager/tags/NodeManager-1.8-3 +pyplnet-SVNPATH := http://svn.planet-lab.org/svn//pyplnet/tags/pyplnet-4.3-2 +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 +fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn//fprobe-ulog/tags/fprobe-ulog-1.1.3-0 +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-0 +iptables-SVNPATH := http://svn.planet-lab.org/svn//iptables/tags/iptables-1.4.1.1-0 +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-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-0 +vsys-SVNBRANCH := 0.9 +vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-1 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn//PLCAPI/tags/PLCAPI-4.3-13 +drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-11 +PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-11 +www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn//www-register-wizard/tags/www-register-wizard-4.2-3 +#Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-6 +nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-2 +BootManager-SVNPATH := http://svn.planet-lab.org/svn//BootManager/tags/BootManager-4.3-5 +pypcilib-SVNPATH := http://svn.planet-lab.org/svn//pypcilib/tags/pypcilib-0.2-6 +BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-13 +VserverReference-SVNPATH := http://svn.planet-lab.org/svn//VserverReference/tags/VserverReference-4.2-12 +BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn//BootstrapFS/tags/BootstrapFS-1.0-8 +MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-9 + # locating the right test directory - see make tests_svnpath -TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/trunk +TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-1 diff --git a/gnuradio.mk b/gnuradio.mk index 4eba655..f9b6e56 100644 --- a/gnuradio.mk +++ b/gnuradio.mk @@ -257,21 +257,21 @@ www-register-wizard-SPEC := www-register-wizard.spec ALL += www-register-wizard IN_MYPLC += www-register-wizard -# -# 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 +### # +### # 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 # # nodeconfig -- 2.43.0