X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=1099a4f343fb8507a123c084607e68929e292104;hb=8de56eafc31b3473a34b67a492c0c90575ca6bf4;hp=60dc73c737028787b8069e37ef6a0276cecc75b6;hpb=ac9e94607161b2bac8d73051bcfc7acb980c4ff0;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 60dc73c7..1099a4f3 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -75,7 +75,7 @@ libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
 # this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-DEPEND-DEVEL-RPMS := kernel-devel
+libnl-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += libnl
 IN_BOOTSTRAPFS += libnl
 endif
@@ -161,7 +161,7 @@ IN_BOOTSTRAPFS += mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel
+iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
 
@@ -203,6 +203,14 @@ endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
+#
+# vsys-scripts
+#
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
+
 #
 # PLCAPI
 #
@@ -212,12 +220,29 @@ ALL += PLCAPI
 IN_MYPLC += PLCAPI
 
 #
-# PLCWWW
+# drupal
+# 
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
+
+#
+# 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
+
+#
+# www-register-wizard
+#
+www-register-wizard-MODULES := www-register-wizard
+www-register-wizard-SPEC := www-register-wizard.spec
+ALL += www-register-wizard
+IN_MYPLC += www-register-wizard
 
 #
 # monitor
@@ -286,8 +311,6 @@ IN_MYPLC += bootcd
 #
 vserver-MODULES := VserverReference build
 vserver-SPEC := vserver-reference.spec
-# Package must be built as root
-vserver-RPMBUILD := sudo bash ./rpmbuild.sh
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
 vserver-RPMDATE := yes
@@ -332,26 +355,13 @@ IN_MYPLC += noderepo
 #
 myplc-MODULES := MyPLC build 
 myplc-SPEC := myplc.spec
-# Package must be built as root
-myplc-RPMBUILD := sudo bash ./rpmbuild.sh
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
 
-## #
-## # myplc-chroot : old-fashioned, chroot-based packaging
-## #
-## myplc-chroot-MODULES := MyPLC build
-## myplc-chroot-SPEC := myplc-chroot.spec
-## # myplc-chroot may require all packages
-## myplc-chroot-DEPEND-PACKAGES := $(IN_MYPLC)
-## myplc-chroot-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
-## myplc-chroot-RPMDATE := yes
-## ALL += myplc-chroot
-
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := MyPLC PLCAPI NodeManager
+myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs