planetbridge too

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 9a69437..60dc73c 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -63,7 +63,7 @@ IN_BOOTSTRAPFS += util-vserver
 #
 # libnl - local import
 # we need either 1.1 or at least 1.0.pre6
-# rebuild this on f8 and centos5 - see kexcludes in build.common
+# rebuild this on centos5 - see kexcludes in build.common
 #
 local_libnl=false
 ifeq "$(DISTRONAME)" "centos5"
@@ -177,20 +177,29 @@ IN_BOOTCD += iproute
 
 #
 # inotify-tools - local import
-# could not find this in cen
+# rebuild this on centos5 (not found) - see kexcludes in build.common
 #
+local_inotify_tools=false
+ifeq "$(DISTRONAME)" "centos5"
+local_inotify_tools=true
+endif
+
+ifeq "$(local_inotify_tools)" "true"
 inotify-tools-MODULES := inotify-tools
 inotify-tools-SPEC := inotify-tools.spec
 inotify-tools-BUILD-FROM-SRPM := yes
 IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools
+endif
 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+ifeq "$(local_inotify_tools)" "true"
 vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
+endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
@@ -219,11 +228,12 @@ ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
 #
-# monitor-server
+# zabbix
 #
-monitor-server-MODULES := Monitor
-monitor-server-SPEC := monitor-server.spec
-ALL += monitor-server
+zabbix-MODULES := Monitor
+zabbix-SPEC := zabbix.spec
+zabbix-BUILD-FROM-SRPM := yes
+ALL += zabbix
 
 #
 # nodeconfig
@@ -249,6 +259,16 @@ pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
 IN_BOOTCD += pypcilib
 
+#
+# pyplnet
+#
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_BOOTSTRAPFS += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
+
 #
 # bootcd
 #
@@ -308,27 +328,25 @@ ALL += noderepo
 IN_MYPLC += noderepo
 
 #
-# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
+# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-myplc-native-MODULES := MyPLC build 
-myplc-native-SPEC := myplc-native.spec
+myplc-MODULES := MyPLC build 
+myplc-SPEC := myplc.spec
 # Package must be built as root
-myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-myplc-native-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
-ALL += myplc-native
+myplc-RPMBUILD := sudo bash ./rpmbuild.sh
+myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
+ALL += myplc
 
 ## #
-## # myplc : old-fashioned, chroot-based packaging
+## # myplc-chroot : old-fashioned, chroot-based packaging
 ## #
-## myplc-MODULES := MyPLC build
-## myplc-SPEC := myplc.spec
-## # Package must be built as root
-## 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
+## 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, 
@@ -336,3 +354,9 @@ ALL += myplc-native
 myplc-docs-MODULES := MyPLC PLCAPI NodeManager
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
+
+# using some other name than myplc-release, as this is a make target already
+release-MODULES := MyPLC
+release-SPEC := myplc-release.spec
+release-RPMDATE := yes
+ALL += release