From: Thierry Parmentelat Date: Fri, 14 Nov 2008 14:20:53 +0000 (+0000) Subject: merged both distros (monitor-server) X-Git-Tag: 4.2-rc26~68 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=72fd27e9ee9d3bdac414ca8cb07311fb28a888a8;p=build.git merged both distros (monitor-server) adopted manually tagged (pypcilib, util-vserver-pl for both, and PLCWWW for planetlab) --- diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk index 090fb81e..d2c2aa11 100644 --- a/onelab-tags-4.2.mk +++ b/onelab-tags-4.2.mk @@ -11,14 +11,14 @@ 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.5-1 util-vserver-SVNBRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-4 -util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-14 +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-15 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-3 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNBRANCH := 1.7 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-37 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-12 -fprobe-ulog-SVNBRANCH := 1.1.2 +fprobe-ulog-SVNBRANCH := 1.1.2 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-6 pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 Mom-SVNBRANCH := 2.2 @@ -38,7 +38,7 @@ nodeconfig-SVNBRANCH := 4.2 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.2-13 BootManager-SVNBRANCH := 3.2 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-3.2-13 -pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-2 +pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-3 BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-5 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-11 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-3 diff --git a/onelab.mk b/onelab.mk index a0cb431c..c940b8ea 100644 --- a/onelab.mk +++ b/onelab.mk @@ -174,7 +174,6 @@ pf2slice-MODULES := pf2slice pf2slice-SPEC := pf2slice.spec ALL += pf2slice - # # PlanetLab Mom: Cleans up your mess # @@ -256,6 +255,14 @@ Monitor-SPEC := Monitor.spec ALL += Monitor IN_BOOTSTRAPFS += Monitor +# +# monitor-server +# +monitor-server-MODULES := Monitor +monitor-server-SPEC := monitor-server.spec +ALL += monitor-server + + # # nodeconfig # diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk index 500de080..456936fe 100644 --- a/planetlab-tags-4.2.mk +++ b/planetlab-tags-4.2.mk @@ -1,17 +1,21 @@ # $Id$ +# SVNBRANCH specifications are not used at build-time, +# but by modules.update to refresh modules.list +# that serves as the default for module-tools -a + linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-30 madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-2 util-vserver-SVNBRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-4 -util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-14 +util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-15 NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-3 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNBRANCH := 1.7 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-37 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-12 -fprobe-ulog-SVNBRANCH := 1.1.2 +fprobe-ulog-SVNBRANCH := 1.1.2 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-6 pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 Mom-SVNBRANCH := 2.2 @@ -23,14 +27,14 @@ vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.7-22 PLCAPI-SVNBRANCH := 4.2 PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.2-13 PLCWWW-SVNBRANCH := 4.2 -PLCWWW-SVNPATH := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-4.2-11 +PLCWWW-SVNPATH := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-4.2-12 Monitor-SVNBRANCH := 1.0 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-1.0-13 nodeconfig-SVNBRANCH := 4.2 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.2-13 BootManager-SVNBRANCH := 3.2 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-3.2-13 -pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-2 +pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-3 BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-5 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-11 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-3 diff --git a/planetlab.mk b/planetlab.mk index 1361354c..0257532f 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -248,7 +248,6 @@ IN_BOOTCD += pypcilib bootcd-MODULES := BootCD build bootcd-SPEC := bootcd.spec bootcd-RPMBUILD := sudo bash ./rpmbuild.sh -# package has *some* dependencies, at least these ones bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) bootcd-DEPEND-FILES := RPMS/yumgroups.xml bootcd-RPMDATE := yes @@ -262,8 +261,6 @@ vserver-MODULES := VserverReference build vserver-SPEC := vserver-reference.spec # Package must be built as root vserver-RPMBUILD := sudo bash ./rpmbuild.sh -# this list is useful for manual builds only, since nightly builds -# always redo all sequentially - try to keep updated vserver-DEPEND-PACKAGES := $(IN_VSERVER) vserver-DEPEND-FILES := RPMS/yumgroups.xml vserver-RPMDATE := yes @@ -276,7 +273,6 @@ IN_BOOTSTRAPFS += vserver bootstrapfs-MODULES := BootstrapFS build bootstrapfs-SPEC := bootstrapfs.spec bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh -# package requires all regular packages bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml bootstrapfs-RPMDATE := yes