# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
-# $Id: onelab.mk 12446 2009-03-12 00:09:58Z thierry $
+# $Id$
#
# see doc in Makefile
#
else
kernel-RPMFLAGS:= --target $(HOSTARCH)
endif
-kernel-SPECVARS := iwlwifi=1
-KERNELS += kernel
+### # 2.6.27 not yet ready for this
+#kernel-SPECVARS := iwlwifi=1
+### tmp
+kernel-RPMDATE := yes
+ALL += kernel
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
-
-ALL += $(KERNELS)
# this is to mark on which image a given rpm is supposed to go
-IN_BOOTCD += $(KERNELS)
-IN_VSERVER += $(KERNELS)
-IN_BOOTSTRAPFS += $(KERNELS)
+IN_BOOTCD += kernel
+IN_VSERVER += kernel
+IN_BOOTSTRAPFS += kernel
# turns out myplc installs kernel-vserver
-IN_MYPLC += $(KERNELS)
+IN_MYPLC += kernel
#
# madwifi
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
-#
-# nozomi
-#
-nozomi-MODULES := nozomi
-nozomi-SPEC := nozomi.spec
-nozomi-DEPEND-DEVEL-RPMS := kernel-devel
-nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
- kernel_release=$(kernel.rpm-release) \
- kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += nozomi
-ALL += nozomi
-
-#
-# comgt
-#
-comgt-MODULES := comgt
-comgt-SPEC := comgt.spec
-IN_BOOTSTRAPFS += comgt
-ALL += comgt
+### # 2.6.27 not yet ready for this
+### #
+### # nozomi
+### #
+### nozomi-MODULES := nozomi
+### nozomi-SPEC := nozomi.spec
+### nozomi-DEPEND-DEVEL-RPMS := kernel-devel
+### nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+### kernel_release=$(kernel.rpm-release) \
+### kernel_arch=$(kernel.rpm-arch)
+### IN_BOOTSTRAPFS += nozomi
+### ALL += nozomi
+###
+### #
+### # comgt
+### #
+### comgt-MODULES := comgt
+### comgt-SPEC := comgt.spec
+### IN_BOOTSTRAPFS += comgt
+### ALL += comgt
#
# util-vserver
IN_BOOTSTRAPFS += vsys
ALL += vsys
-#
-# dummynet_image
-#
-dummynet_image-MODULES := dummynet_image
-dummynet_image-SPEC := dummynet_image.spec
-IN_MYPLC += dummynet_image
-ALL += dummynet_image
-
#
# PLCAPI
#
ALL += www-register-wizard
IN_MYPLC += www-register-wizard
-#
-# monitor
-#
-monitor-MODULES := Monitor
-monitor-SPEC := Monitor.spec
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
-
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-ALL += zabbix
+### #
+### # monitor
+### #
+### monitor-MODULES := Monitor
+### monitor-SPEC := Monitor.spec
+### ALL += monitor
+### IN_BOOTSTRAPFS += monitor
+###
+### #
+### # zabbix
+### #
+### zabbix-MODULES := Monitor
+### zabbix-SPEC := zabbix.spec
+### zabbix-BUILD-FROM-SRPM := yes
+### ALL += zabbix
#
# nodeconfig
# 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