build planetlab distro (i.e. new kernel) with drupal+plewww, PLCWWW too broken

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 7bbcaa9..628bede 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -23,9 +23,10 @@ iptables-SVNPATH             := http://svn.planet-lab.org/svn/iptables/trunk
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/trunk
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/trunk
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
-#vsys-SVNPATH                  := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.7-20
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/trunk
-PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/trunk
+drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/trunk
+PLEWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLEWWW/trunk
+# PLCWWW-SVNPATH                       := http://svn.planet-lab.org/svn/PLCWWW/trunk
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/trunk
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/trunk
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/trunk

diff --git a/planetlab.mk b/planetlab.mk
index bd99bc8..0e89dd8 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -211,13 +211,30 @@ PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
 IN_MYPLC += PLCAPI
 
+# #
+# # PLCWWW
+# #
+# PLCWWW-MODULES := PLCWWW
+# PLCWWW-SPEC := PLCWWW.spec
+# ALL += PLCWWW
+# IN_MYPLC += PLCWWW
+
+#
+# drupal
+# 
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
+
 #
-# PLCWWW
+# use the plewww module instead
 #
-PLCWWW-MODULES := PLCWWW
-PLCWWW-SPEC := PLCWWW.spec
-ALL += PLCWWW
-IN_MYPLC += PLCWWW
+plewww-MODULES := PLEWWW
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
 
 #
 # monitor