#
# 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)" "f8"
-local_libnl=true
-endif
ifeq "$(DISTRONAME)" "centos5"
local_libnl=true
endif
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
#
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
#
# 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
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
+
+#
+# use the plewww module instead
+#
+plewww-MODULES := PLEWWW
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
+
#
-# PLCWWW
+# www-register-wizard
#
-PLCWWW-MODULES := PLCWWW
-PLCWWW-SPEC := PLCWWW.spec
-ALL += PLCWWW
-IN_MYPLC += PLCWWW
+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
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
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
#
#
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
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
-# 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-MODULES := MyPLC build
+myplc-SPEC := myplc.spec
+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,
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