use recent tags & dont build old-fashioned myplc

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 47356c2..48b26eb 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -5,8 +5,7 @@
 # that serves as the default for module-tools -a
 
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
-# not stable yet ; needs one more 'sign off' from Andy
-linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-3
+linux-2.6-SVNPATH              := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-4
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.3.3-1
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/tags/wireless-tools-29-0
 nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/tags/nozomi-2.21-1
@@ -17,7 +16,6 @@ util-vserver-SVNPATH          := http://svn.planet-lab.org/svn/util-vserver/tags/util-vs
 util-vserver-pl-SVNPATH         := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-3
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-2
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-# not stable yet ; needs 'set_name' to work with fprobe-ulog
 NodeManager-SVNBRANCH          := 1.7
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-7
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-10
@@ -25,8 +23,7 @@ libhttpd++-SVNPATH            := http://svn.planet-lab.org/svn/libhttpd++/tags/libhttpd++-
 proper-SVNPATH                 := http://svn.planet-lab.org/svn/proper/tags/proper-0.3-37
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-10
 ulogd-SVNPATH                  := http://svn.planet-lab.org/svn/ulogd/tags/ulogd-1.24-4
-# needs 'get_name' to work with NodeManager
-fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-2
+fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-3
 # not stable yet
 pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-1
 PlanetFlow-SVNPATH             := http://svn.planet-lab.org/svn/PlanetFlow/tags/PlanetFlow-4.0-3
@@ -39,7 +36,7 @@ PLCAPI-SVNBRANCH              := dummynet
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-dummynet-2
 PLCWWW-SVNBRANCH               := onelab.4.2
 PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-onelab.4.2-11
-Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-1.0-1
+Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-1.0-2
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.2-4
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-3.2-6
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-1

diff --git a/onelab.mk b/onelab.mk
index f5f5e99..5deb426 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -318,7 +318,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
@@ -332,8 +331,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
@@ -346,7 +343,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
@@ -374,19 +370,6 @@ noderepo-RPMDATE := yes
 ALL += noderepo
 IN_MYPLC += noderepo
 
-#
-# myplc : initial, chroot-based packaging
-#
-myplc-MODULES := MyPLC build
-myplc-SPEC := myplc.spec
-# Package must be built as root
-myplc-RPMBUILD := sudo bash ./rpmbuild.sh
-# myplc may require all packages
-myplc-DEPEND-PACKAGES := $(IN_MYPLC)
-myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
-myplc-RPMDATE := yes
-ALL += myplc
-
 #
 # MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
 #
@@ -394,9 +377,19 @@ myplc-native-MODULES := MyPLC build
 myplc-native-SPEC := myplc-native.spec
 # Package must be built as root
 myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-# Thierry : don't depend on anything at build-time
-#myplc-native-DEPEND-PACKAGES :=
-# Thierry : dunno about this one, let's stay safe
 myplc-native-DEPEND-FILES := myplc-release
 ALL += myplc-native
 
+## #
+## # myplc : old-fashioned, chroot-based packaging
+## #
+## myplc-MODULES := MyPLC build
+## myplc-SPEC := myplc.spec
+## # Package must be built as root
+## myplc-RPMBUILD := sudo bash ./rpmbuild.sh
+## # myplc may require all packages
+## myplc-DEPEND-PACKAGES := $(IN_MYPLC)
+## myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
+## myplc-RPMDATE := yes
+## ALL += myplc
+