Tagging module Monitor - Monitor-1.0-2

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 355072c..5f45c8e 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -17,7 +17,7 @@
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-patches
+kernel-MODULES := linux-2.6
 kernel-SPEC := kernel-2.6.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
@@ -223,17 +223,21 @@ IN_BOOTSTRAPFS += iproute
 #
 # vsys
 #
-vsys-MODULES := vsys
-vsys-SPEC := vsys.spec
-ifeq "$(DISTRONAME)" "f7"
-IN_BOOTSTRAPFS += vsys
-ALL += vsys
+vsys_support=yes
+ifeq "$(DISTRONAME)" "fc4"
+vsys_support=
 endif
-ifeq "$(DISTRONAME)" "f8"
-IN_BOOTSTRAPFS += vsys
-ALL += vsys
+ifeq "$(DISTRONAME)" "fc6"
+vsys_support=
 endif
+# cannot find the required packages (see devel.pkgs) on centos5
 ifeq "$(DISTRONAME)" "centos5"
+vsys_support=
+endif
+
+ifeq "$(vsys_support)" "yes"
+vsys-MODULES := vsys
+vsys-SPEC := vsys.spec
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif
@@ -254,6 +258,14 @@ PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
 
+#
+# monitor
+#
+Monitor-MODULES := Monitor
+Monitor-SPEC := Monitor.spec
+ALL += Monitor
+IN_BOOTSTRAPFS += Monitor
+
 #
 # nodeconfig
 #
@@ -287,6 +299,7 @@ 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
 ALL += bootcd
 IN_MYPLC += bootcd
 
@@ -301,6 +314,7 @@ vserver-RPMBUILD := sudo bash ./rpmbuild.sh
 # always redo all sequentially - try to keep updated
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
+vserver-RPMDATE := yes
 ALL += vserver
 IN_BOOTSTRAPFS += vserver
 
@@ -313,6 +327,7 @@ 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
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
@@ -333,6 +348,7 @@ noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 #export rpm list to the specfile
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
+noderepo-RPMDATE := yes
 ALL += noderepo
 IN_MYPLC += noderepo
 
@@ -346,6 +362,7 @@ 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
 
 #