From: Thierry Parmentelat Date: Sun, 7 Mar 2010 13:31:31 +0000 (+0000) Subject: fix pyaspects and omf (svnpath was missing in some kernels) - check order in .mk... X-Git-Tag: 5.0-rc2~64 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c09275bcdface7e1ed641290872ad504d837c089;p=build.git fix pyaspects and omf (svnpath was missing in some kernels) - check order in .mk and *tags.mk - iptables first --- diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index d395c6d9..ef79c8b5 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -8,6 +8,8 @@ ipfwsrc-SVNPATH := http://svn.planet-lab.org/svn/ipfw/tags/ipfw- madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0 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 +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 @@ -20,8 +22,6 @@ 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-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 @@ -32,18 +32,20 @@ PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLE 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 +pyaspects-SVNPATH := http://svn.planet-lab.org/svn/pyaspects/trunk +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 omf-SVNPATH := http://svn.planet-lab.org/svn/omf/trunk +# 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-5.0-2 diff --git a/onelab-tags.mk b/onelab-tags.mk index 3a207339..c6385a21 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -11,6 +11,9 @@ madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3 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 +iptables-SVNBRANCH := 1.3.8 +iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-10 +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 @@ -23,9 +26,6 @@ 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-2 -iptables-SVNBRANCH := 1.3.8 -iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-10 -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 @@ -36,19 +36,20 @@ PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLE 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 +pyaspects-SVNPATH := http://svn.planet-lab.org/svn/pyaspects/trunk +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 -pyaspects-SVNPATH := http://svn.planet-lab.org/svn/pyaspects/trunk omf-SVNPATH := http://svn.planet-lab.org/svn/omf/trunk +# 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-5.0-2 diff --git a/onelab.mk b/onelab.mk index 5bcc4b11..9bf7e62e 100644 --- a/onelab.mk +++ b/onelab.mk @@ -110,6 +110,25 @@ umts-frontend-SPEC := frontend.spec IN_VSERVER += umts-frontend ALL += umts-frontend +# +# 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 # @@ -215,25 +234,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 @@ -314,13 +314,6 @@ monitor-SPEC := Monitor.spec ALL += monitor IN_BOOTSTRAPFS += monitor -# -# PLC RT -# -plcrt-MODULES := PLCRT -plcrt-SPEC := plcrt.spec -ALL += plcrt - # # zabbix # @@ -329,6 +322,13 @@ zabbix-SPEC := zabbix.spec zabbix-BUILD-FROM-SRPM := yes ALL += zabbix +# +# PLC RT +# +plcrt-MODULES := PLCRT +plcrt-SPEC := plcrt.spec +ALL += plcrt + # # pyopenssl # @@ -345,7 +345,6 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects - # # sfa - Slice Facility Architecture #