From b6e828afe2ea5b061fc00a82fb3738afce07c605 Mon Sep 17 00:00:00 2001 From: thierry Date: Fri, 8 Jan 2010 17:57:24 +0000 Subject: [PATCH 01/16] oops again --- wextoolbox-tags.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 17a5af3..cae5933 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -13,7 +13,7 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1 #sge-SVNPATH := http://svn.onelab.eu/sge/trunk # using the 2.6.27 kernel linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk -madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0 +madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/trunk util-vserver-SVNBRANCH := scholz 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 -- 2.43.0 From dd7555403759e568f9f1de5ae4e9826ab9d3a70c Mon Sep 17 00:00:00 2001 From: thierry Date: Fri, 8 Jan 2010 18:07:03 +0000 Subject: [PATCH 02/16] --- devel.pkgs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/devel.pkgs b/devel.pkgs index d2c4094..7aa2ff4 100644 --- a/devel.pkgs +++ b/devel.pkgs @@ -84,6 +84,9 @@ package: ocaml.@arch@ ocaml-docs # use local inotify-tools on centos package>=f8:inotify-tools-devel ########## +# for util-vserver +package: ctags +package>=f12: e2fsprogs-devel ## for util-vserver-pl # use local libnl on centos package>=f8: libnl-devel -- 2.43.0 From f1a63fd55a82fefb75f21d3328b77d691bedc1e7 Mon Sep 17 00:00:00 2001 From: thierry Date: Sat, 9 Jan 2010 09:59:29 +0000 Subject: [PATCH 03/16] catch up --- wextoolbox-tags.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index cae5933..e173ab5 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -13,14 +13,14 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1 #sge-SVNPATH := http://svn.onelab.eu/sge/trunk # using the 2.6.27 kernel linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk -madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/trunk +madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0 util-vserver-SVNBRANCH := scholz 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-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-15 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-21 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 @@ -33,22 +33,22 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti 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-12 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-31 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-32 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-40 +PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-41 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-0 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-29 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7 -BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-13 +BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-16 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 -BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-16 +BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17 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-36 -sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-6 +BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11 +MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-8 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 # 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-6 -- 2.43.0 From b4e8b41b35e654a6c7d61d5496b3bdf4b6999ac0 Mon Sep 17 00:00:00 2001 From: thierry Date: Sat, 9 Jan 2010 11:00:53 +0000 Subject: [PATCH 04/16] missing devel pkg --- devel.pkgs | 1 + 1 file changed, 1 insertion(+) diff --git a/devel.pkgs b/devel.pkgs index 7aa2ff4..e11e9cc 100644 --- a/devel.pkgs +++ b/devel.pkgs @@ -74,6 +74,7 @@ package: postgresql postgresql-devel postgresql-python postgresql-server # if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64) # in an undetermined order, and php-config --extension-dir might return the wrong place package: php php-devel.@arch@ php-gd php-pgsql +package>=f12: php-devel package: PyXML # used to reference SOAPpy as well # for pypcilib -- 2.43.0 From 8c5c2dac3ea58bc82214c069deac857096ba286a Mon Sep 17 00:00:00 2001 From: thierry Date: Wed, 20 Jan 2010 08:24:44 +0000 Subject: [PATCH 05/16] Setting tag gnuradio-3.2.2-22 reworked for f12 --- wextoolbox-tags.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index e173ab5..8cbe70d 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -4,7 +4,7 @@ # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication boost-SVNPATH := http://svn.onelab.eu/boost/tags/boost-1.37.0-6 -gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/trunk +gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/tags/gnuradio-3.2.2-22 bbn_80211-SVNPATH := http://svn.onelab.eu/bbn_80211/trunk 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 -- 2.43.0 From 318eeae6ffffe4306d4044802662d4ee9ebdf10b Mon Sep 17 00:00:00 2001 From: thierry Date: Wed, 20 Jan 2010 08:26:32 +0000 Subject: [PATCH 06/16] Setting tag bbn_80211-3.2.2-2 rework for f12 --- wextoolbox-tags.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 8cbe70d..b17ada3 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -5,7 +5,7 @@ boost-SVNPATH := http://svn.onelab.eu/boost/tags/boost-1.37.0-6 gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/tags/gnuradio-3.2.2-22 -bbn_80211-SVNPATH := http://svn.onelab.eu/bbn_80211/trunk +bbn_80211-SVNPATH := http://svn.onelab.eu/bbn_80211/tags/bbn_80211-3.2.2-2 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 -- 2.43.0 From c3b7f522ac526ff0216f6b2fa9133d964a78cc59 Mon Sep 17 00:00:00 2001 From: thierry Date: Fri, 29 Jan 2010 12:12:47 +0000 Subject: [PATCH 07/16] new tags --- wextoolbox-tags.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index b17ada3..99a994b 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -20,7 +20,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-21 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-23 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 @@ -32,7 +32,7 @@ iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16 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-12 +vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-13 PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-32 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-41 @@ -46,7 +46,7 @@ BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17 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-11 MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37 -sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-8 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-9 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 -- 2.43.0 From ceadcbbd33197938c6156bef560d0111bec4ef73 Mon Sep 17 00:00:00 2001 From: thierry Date: Fri, 29 Jan 2010 12:17:56 +0000 Subject: [PATCH 08/16] Setting tag bbn_80211-3.2.2-3 add explicit dep to boost --- wextoolbox-tags.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 99a994b..322767c 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -5,7 +5,7 @@ boost-SVNPATH := http://svn.onelab.eu/boost/tags/boost-1.37.0-6 gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/tags/gnuradio-3.2.2-22 -bbn_80211-SVNPATH := http://svn.onelab.eu/bbn_80211/tags/bbn_80211-3.2.2-2 +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 -- 2.43.0 From cbd8d8c6b8c062a68c60474e48f423515ff66e59 Mon Sep 17 00:00:00 2001 From: thierry Date: Sun, 14 Feb 2010 10:57:09 +0000 Subject: [PATCH 09/16] catch up --- wextoolbox-tags.mk | 48 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 322767c..c050428 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -1,8 +1,6 @@ # $Id$ # $URL$ -# build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication - boost-SVNPATH := http://svn.onelab.eu/boost/tags/boost-1.37.0-6 gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/tags/gnuradio-3.2.2-22 bbn_80211-SVNPATH := http://svn.onelab.eu/bbn_80211/tags/bbn_80211-3.2.2-3 @@ -11,17 +9,20 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1 #turned off #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 + # using the 2.6.27 kernel linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0 util-vserver-SVNBRANCH := scholz 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-19 -NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-22 +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-1.8-23 -pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-2 +pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5 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 @@ -31,24 +32,29 @@ 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-4 -vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-13 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-32 +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-14 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-2 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-41 +PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-41 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-0 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-29 -nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7 -BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-16 -pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 -BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17 -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-11 -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37 -sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-9 +pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-1 +Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30 +nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-1 +BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-2 +pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 +BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1 +VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-1 +BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-1 +MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-1 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10 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 # locating the right test directory - see make tests_svnpath -tests-SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-6 +tests-SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-2 + +### temporary +# nozomi not needed anymore for 2.6.27 +ALL:=$(subst nozomi,,$(ALL)) +IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS)) -- 2.43.0 From dc87a9dfdd79c29f8afa1021e02b72412bf4bc10 Mon Sep 17 00:00:00 2001 From: thierry Date: Wed, 24 Feb 2010 14:00:06 +0000 Subject: [PATCH 10/16] back to a stable tag for kernel --- wextoolbox-tags.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index c050428..657fa6b 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -13,7 +13,7 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication # using the 2.6.27 kernel -linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk +linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-6 madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0 util-vserver-SVNBRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 -- 2.43.0 From 301f018ee404b420843877471f67d426fbf70865 Mon Sep 17 00:00:00 2001 From: thierry Date: Tue, 30 Mar 2010 21:39:58 +0000 Subject: [PATCH 11/16] catching up with 1lab-k27 + gnuradio from trunk --- wextoolbox-tags.mk | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 657fa6b..e46511e 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -2,7 +2,7 @@ # $URL$ boost-SVNPATH := http://svn.onelab.eu/boost/tags/boost-1.37.0-6 -gnuradio-SVNPATH := http://svn.onelab.eu/gnuradio/tags/gnuradio-3.2.2-22 +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 @@ -12,47 +12,46 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1 # build-SVNPATH is now set by vbuild-nightly.sh to avoid duplication -# using the 2.6.27 kernel -linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-6 +linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk 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.1.1-1 +iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2 util-vserver-SVNBRANCH := scholz 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-22 +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 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-2 -pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-5 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-3 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 +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-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-2 -iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.1.1-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-4 -vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-14 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-2 +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/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-41 +PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-42 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-1 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30 +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 +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-1 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-2 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-1 -VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-5.0-1 -BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-1 -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-1 -sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-10 -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 +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-2 +MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-5.0-2 # locating the right test directory - see make tests_svnpath -tests-SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-5.0-2 +tests-SVNPATH := http://svn.planet-lab.org/svn/tests/trunk ### temporary # nozomi not needed anymore for 2.6.27 -- 2.43.0 From 2d15afb16c1285397357e7f8cd111b3794e40739 Mon Sep 17 00:00:00 2001 From: thierry Date: Wed, 31 Mar 2010 15:13:10 +0000 Subject: [PATCH 12/16] now that gnuradio builds again, let us revert to the tagged kernel --- wextoolbox-tags.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index e46511e..e75b69a 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -12,7 +12,7 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/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/trunk +linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6//tags/linux-2.6-27-6 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.1.1-1 iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2 -- 2.43.0 From c72468dc9e98521f60861b65d202c6b29ede54dd Mon Sep 17 00:00:00 2001 From: thierry Date: Tue, 20 Apr 2010 15:17:29 +0000 Subject: [PATCH 13/16] catch up with mainstream - uses linux 2.6 trunk for new kernel config --- wextoolbox-tags.mk | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index e75b69a..e3022dd 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -12,9 +12,9 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/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-6 +linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk 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.1.1-1 +iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.7-2 iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2 util-vserver-SVNBRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 @@ -22,7 +22,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-23 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-3 +NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-5 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-0 @@ -32,26 +32,26 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti 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/trunk +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-8 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-42 -www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 -pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-1 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-30 +PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-43 +www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-2 +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 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 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-1 -BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-5.0-2 +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-1 +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-2 -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-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 # 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-5.0-5 ### temporary # nozomi not needed anymore for 2.6.27 -- 2.43.0 From 391175b313f30a1dd9aed6ca4c2461b93b2f238c Mon Sep 17 00:00:00 2001 From: thierry Date: Wed, 21 Apr 2010 14:20:16 +0000 Subject: [PATCH 14/16] move the conditional definitions of *-BUILD-FROM-RPMS in the tags files --- wextoolbox-tags.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index e3022dd..1099057 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -15,6 +15,7 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/spectools-2009_06_R1-1 linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk 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-BUILD-FROM-SRPM := yes # tmp iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2 util-vserver-SVNBRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6 -- 2.43.0 From 60e4a1125ec0364e9334499eaef9f7a44875bec9 Mon Sep 17 00:00:00 2001 From: thierry Date: Mon, 26 Apr 2010 08:22:15 +0000 Subject: [PATCH 15/16] catch up with onelab --- wextoolbox-tags.mk | 4 ++-- wextoolbox.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 1099057..261192f 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -12,7 +12,7 @@ spectools-SVNPATH := http://svn.onelab.eu/spectools/tags/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/trunk +linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-27-8 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-BUILD-FROM-SRPM := yes # tmp @@ -36,7 +36,7 @@ vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-sc PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-8 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 -www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-2 +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 PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 diff --git a/wextoolbox.mk b/wextoolbox.mk index a7f492d..299ca33 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -371,7 +371,7 @@ ALL += sfa # # nodeconfig # -nodeconfig-MODULES := nodeconfig build +nodeconfig-MODULES := nodeconfig nodeconfig-SPEC := nodeconfig.spec ALL += nodeconfig IN_MYPLC += nodeconfig -- 2.43.0 From 778fb6118df8da36875430ca0037109daa12bb31 Mon Sep 17 00:00:00 2001 From: thierry Date: Mon, 26 Apr 2010 08:44:32 +0000 Subject: [PATCH 16/16] catch up - continued --- wextoolbox-tags.mk | 3 +- wextoolbox.mk | 68 ++++++++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 261192f..c90bcf0 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -17,6 +17,7 @@ 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-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 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 @@ -33,7 +34,7 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti 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 +plcapi-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-8 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 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3 diff --git a/wextoolbox.mk b/wextoolbox.mk index 299ca33..e413108 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -101,8 +101,6 @@ kernel-RPMFLAGS:= --target $(HOSTARCH) endif ### not needed with 2.6.27 anymore ### kernel-SPECVARS := iwlwifi=1 -### tmp -kernel-RPMDATE := yes KERNELS += kernel kernels: $(KERNELS) @@ -116,6 +114,24 @@ IN_BOOTSTRAPFS += $(KERNELS) # turns out myplc installs kernel-vserver IN_MYPLC += $(KERNELS) +# +# 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 + # # madwifi # @@ -129,6 +145,25 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ ALL += madwifi IN_BOOTSTRAPFS += madwifi +# +# iptables +# +iptables-MODULES := iptables +iptables-SPEC := iptables.spec +iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers +ALL += iptables +IN_BOOTSTRAPFS += iptables + +# +# iproute +# +iproute-MODULES := iproute2 +iproute-SPEC := iproute.spec +ALL += iproute +IN_BOOTSTRAPFS += iproute +IN_VSERVER += iproute +IN_BOOTCD += iproute + # # util-vserver # @@ -234,25 +269,6 @@ mom-SPEC := pl_mom.spec ALL += mom IN_BOOTSTRAPFS += mom -# -# iptables -# -iptables-MODULES := iptables -iptables-SPEC := iptables.spec -iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers -ALL += iptables -IN_BOOTSTRAPFS += iptables - -# -# iproute -# -iproute-MODULES := iproute2 -iproute-SPEC := iproute.spec -ALL += iproute -IN_BOOTSTRAPFS += iproute -IN_VSERVER += iproute -IN_BOOTCD += iproute - # # inotify-tools - local import # rebuild this on centos5 (not found) - see kexcludes in build.common @@ -292,10 +308,10 @@ ALL += vsys-scripts # # PLCAPI # -PLCAPI-MODULES := PLCAPI -PLCAPI-SPEC := PLCAPI.spec -ALL += PLCAPI -IN_MYPLC += PLCAPI +plcapi-MODULES := PLCAPI +plcapi-SPEC := PLCAPI.spec +ALL += plcapi +IN_MYPLC += plcapi # # drupal @@ -461,7 +477,7 @@ IN_MYPLC += noderepo # # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver # -myplc-MODULES := MyPLC build +myplc-MODULES := MyPLC myplc-SPEC := myplc.spec myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml ALL += myplc -- 2.43.0