* temp: disabling proper

* exp:  using 2.6.22 on all platforms

diff --git a/Makefile b/Makefile
index 3324bc5..3ec67e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@
 #     the complete path where this module lies; 
 #     you can specify the trunk or a given tag with this variable
 # 
-# OR if the module is managed under cvs
+# OR if the module is managed under cvs (will be obsoleted)
 # 
 # (*) module-CVSROOT
 # (*) module-TAG

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 81fc6f4..dd8cdde 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -1,7 +1,7 @@
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
 # see planetlab.mk for when we use one or the other
 linux-tree-SVNPATH             := http://svn.planet-lab.org/svn/linux-2.6/branches/2.6.20
-linux-patches-SVNPATH          := http://svn.planet-lab.org/svn/linux-2.6/trunk
+#linux-patches-SVNPATH         := http://svn.planet-lab.org/svn/linux-2.6/trunk
 # 
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/trunk
@@ -10,7 +10,7 @@ PingOfDeath-SVNPATH           := http://svn.planet-lab.org/svn/PingOfDeath/trunk
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/trunk
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/trunk
 libhttpd++-SVNPATH             := http://svn.planet-lab.org/svn/libhttpd++/trunk
-proper-SVNPATH                 := http://svn.planet-lab.org/svn/proper/trunk
+#proper-SVNPATH                        := http://svn.planet-lab.org/svn/proper/trunk
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/trunk
 ulogd-SVNPATH                  := http://svn.planet-lab.org/svn/ulogd/trunk
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/trunk

diff --git a/planetlab.mk b/planetlab.mk
index 4acdf9c..1e4b119 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -20,7 +20,8 @@
 # in this case the srpm is created by running make srpm in the codebase
 #
 
-ifeq "$(RELEASE)" "8"
+# using 2.6.22 on all platforms - experimental
+#ifeq "$(RELEASE)" "8"
 srpm-kernel-$(HOSTARCH)-MODULES := linux-patches
 srpm-kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
 ifeq ($(HOSTARCH),i386)
@@ -30,16 +31,16 @@ srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
 endif
 KERNELS += srpm-kernel-$(HOSTARCH)
 
-else
-kernel-$(HOSTARCH)-MODULES := linux-tree
-kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
-ifeq ($(HOSTARCH),i386)
-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
-else
-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
-endif
-KERNELS += kernel-$(HOSTARCH)
-endif
+#else
+#kernel-$(HOSTARCH)-MODULES := linux-tree
+#kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
+#ifeq ($(HOSTARCH),i386)
+#kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+#else
+#kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+#endif
+#KERNELS += kernel-$(HOSTARCH)
+#endif
 
 kernel: $(KERNELS)
 kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
@@ -112,7 +113,8 @@ proper-SPEC := proper.spec
 proper-RPMBUILD := sudo bash ./rpmbuild.sh
 # proper uses scripts in util-python for building
 proper-DEPENDS := libhttpd++ util-python
-ALL += proper
+# disabled temporarily (or ?)
+#ALL += proper
 
 #
 # codemux: Port 80 demux