else
kernel-RPMFLAGS:= --target $(HOSTARCH)
endif
+kernel-SPECVARS += kernelconfig=planetlab
KERNELS += kernel
kernels: $(KERNELS)
IN_BOOTCD += $(KERNELS)
IN_VSERVER += $(KERNELS)
IN_BOOTSTRAPFS += $(KERNELS)
-# turns out myplc installs kernel-vserver
-IN_MYPLC += $(KERNELS)
#
# madwifi
#
-
-ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk"
+# skip this with k32/f8
+ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
ifneq "$(DISTRONAME)" "f8"
madwifi-MODULES := madwifi
madwifi-SPEC := madwifi.spec
endif
endif
+#
+# iptables
+#
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes
+iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+ALL += iptables
+IN_BOOTSTRAPFS += iptables
+
+#
+# iproute
+#
+iproute-MODULES := iproute2
+iproute-SPEC := iproute.spec
+iproute-BUILD-FROM-SRPM := yes
+ALL += iproute
+IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
+
#
# util-vserver
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
+# starting with 0.4
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
ALL += util-vserver
IN_BOOTSTRAPFS += util-vserver
#
# libnl - local import
# we need either 1.1 or at least 1.0.pre6
-# rebuild this on centos5 - see kexcludes in build.common
+# rebuild this on centos5 - see yumexclude
#
local_libnl=false
ifeq "$(DISTRONAME)" "centos5"
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
+# rebuild this on centos5 (not found) - see yumexclude
#
local_inotify_tools=false
ifeq "$(DISTRONAME)" "centos5"
local_inotify_tools=true
endif
+ifeq "$(DISTRONAME)" "sl6"
+local_inotify_tools=true
+endif
+
ifeq "$(local_inotify_tools)" "true"
inotify-tools-MODULES := inotify-tools
inotify-tools-SPEC := inotify-tools.spec
openvswitch-MODULES := openvswitch
openvswitch-SPEC := openvswitch.spec
openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
IN_BOOTSTRAPFS += openvswitch
ALL += openvswitch
+endif
#
# vsys
IN_BOOTSTRAPFS += vsys
ALL += vsys
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLIVER += vsyssh
+ALL += vsyssh
+
#
# vsys-scripts
#
ALL += vsys-scripts
#
-# PLCAPI
+# plcapi
#
plcapi-MODULES := plcapi
plcapi-SPEC := PLCAPI.spec
#
# monitor
#
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
monitor-SPEC := Monitor.spec
monitor-DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
plcrt-SPEC := plcrt.spec
ALL += plcrt
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-zabbix-DEVEL-RPMS += python-cherrypy
-ALL += zabbix
-
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
#
# pyopenssl
#
pyopenssl-SPEC := pyOpenSSL.spec
pyopenssl-BUILD-FROM-SRPM := yes
ALL += pyopenssl
-
+endif
#
# pyaspects
ALL += sfa
endif
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+
#
# nodeconfig
#
-# xxx needed when upgrading to 5.0
-#nodeconfig-MODULES := nodeconfig
nodeconfig-MODULES := nodeconfig
nodeconfig-SPEC := nodeconfig.spec
ALL += nodeconfig
IN_MYPLC += pyplnet
IN_BOOTCD += pyplnet
-
#
# OMF resource controller
#
omf-expctl-SPEC := omf-expctl.spec
ALL += omf-expctl
-
#
# bootcd
#
noderepo-MODULES := bootstrapfs
noderepo-SPEC := noderepo.spec
-# package requires all regular packages
+# 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
ALL += noderepo
IN_MYPLC += 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
+# 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
#
# 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 Monitor
+myplc-docs-MODULES := myplc plcapi nodemanager monitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs
release-SPEC := myplc-release.spec
release-RPMDATE := yes
ALL += release
-