X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=21488aa81038a62884dd917070e915ad2a299d39;hb=255dd59f34ce653224e39f87a6796db866ff92e7;hp=d86e815881722d27521a6ac5b9595691bc03c912;hpb=1a3db728ab1633cccc738004402f118cdedbc0e9;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index d86e8158..21488aa8 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -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
 #
@@ -211,14 +219,6 @@ PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
 IN_MYPLC += PLCAPI
 
-# #
-# # PLCWWW
-# #
-# PLCWWW-MODULES := PLCWWW
-# PLCWWW-SPEC := PLCWWW.spec
-# ALL += PLCWWW
-# IN_MYPLC += PLCWWW
-
 #
 # drupal
 # 
@@ -260,6 +260,22 @@ zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
 ALL += zabbix
 
+#
+# pyopenssl
+#
+pyopenssl-MODULES := pyopenssl
+pyopenssl-SPEC := pyOpenSSL.spec
+pyopenssl-BUILD-FROM-SRPM := yes
+ALL += pyopenssl
+
+
+#
+# geniwrapper
+#
+geniwrapper-MODULES := geniwrapper
+geniwrapper-SPEC := geniwrapper.spec
+ALL += geniwrapper
+
 #
 # nodeconfig
 #
@@ -358,21 +374,10 @@ myplc-SPEC := myplc.spec
 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