kernel-RPMFLAGS:= --target $(HOSTARCH)
endif
# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
-kernel-SPECVARS := iwlwifi=1
+kernel-SPECVARS += iwlwifi=1
+kernel-SPECVARS += kernelconfig=planetlab
KERNELS += kernel
kernels: $(KERNELS)
#
# ipfw: root context module, and slice companion
#
-ipfwroot-MODULES := ipfwsrc
+ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ALL += ipfwroot
+IN_BOOTSTRAPFS += ipfwroot
-ipfwslice-MODULES := ipfwsrc
+ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
IN_VSERVER += umts-frontend
ALL += umts-frontend
+#
+# iptables
+#
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+ifeq "$(PLDISTROTAGS)" "onelab-k27-tags.mk"
+iptables-BUILD-FROM-SRPM := yes
+endif
+iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+ALL += iptables
+IN_BOOTSTRAPFS += iptables
+
+#
+# iproute
+#
+iproute-MODULES := iproute2
+iproute-SPEC := iproute.spec
+ALL += iproute
+IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
+
#
# util-vserver
#
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
+#
+# DistributedRateLimiting
+#
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
+
+
#
# pf2slice
#
ALL += mom
IN_BOOTSTRAPFS += mom
-#
-# iptables
-#
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
-
#
# inotify-tools - local import
# rebuild this on centos5 (not found) - see kexcludes in build.common
ALL += vsys-scripts
#
-# dummynet_image
-#
-dummynet_image-MODULES := dummynet_image
-dummynet_image-SPEC := dummynet_image.spec
-ALL += dummynet_image
-
-#
-# PLCAPI
+# plcapi
#
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
+plcapi-MODULES := PLCAPI
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
#
# drupal
ALL += monitor
IN_BOOTSTRAPFS += monitor
-#
-# PLC RT
-#
-plcrt-MODULES := PLCRT
-plcrt-SPEC := plcrt.spec
-ALL += plcrt
-
#
# zabbix
#
zabbix-BUILD-FROM-SRPM := yes
ALL += zabbix
+#
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
+
#
# pyopenssl
#
pyopenssl-BUILD-FROM-SRPM := yes
ALL += pyopenssl
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
+
+#
+# ejabberd
+#
+ejabberd-MODULES := ejabberd
+ejabberd-SPEC := ejabberd.spec
+ejabberd-BUILD-FROM-SRPM := yes
+ALL += ejabberd
#
# sfa - Slice Facility Architecture
#
# nodeconfig
#
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
nodeconfig-SPEC := nodeconfig.spec
ALL += nodeconfig
IN_BOOTSTRAPFS += pyplnet
IN_BOOTCD += pyplnet
+#
+# OMF resource controller
+#
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_VSERVER += omf-resctl
+
+#
+# OMF exp controller
+#
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
+
#
# bootcd
#
# noderepo
#
# all rpms resulting from packages marked as being in bootstrapfs and vserver
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms))
# replace space with +++ (specvars cannot deal with spaces)
SPACE=$(subst x, ,x)
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
noderepo-MODULES := BootstrapFS
noderepo-SPEC := noderepo.spec
noderepo-RPMBUILD := bash ./rpmbuild.sh
-# package requires all regular packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+# package requires all embedded packages
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(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
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
+
+slicerepo-MODULES := BootstrapFS
+slicerepo-SPEC := slicerepo.spec
+slicerepo-RPMBUILD := bash ./rpmbuild.sh
+# package requires all embedded packages
+slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
+slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
#
# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
#