# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
+# $Id: wextoolbox.mk 1696 2010-04-26 19:18:48Z thierry $
+#
### NOTES on diffs with onelab
# 2.6.27 vs 2.6.22 - does not need iwlwifi exception anymore
# does not include:
# see doc in Makefile
#
-#
-# boost
-#
-# we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
-# this build is based on the f11 rpm, i.e. boost-1.37
-#
-boost-MODULES := boost
-boost-SPEC := boost.spec
-boost-BUILD-FROM-SRPM := yes
-ALL += boost
-IN_BOOTSTRAPFS += boost
-
-#
-# gnuradio
-#
-gnuradio-MODULES := gnuradio
-gnuradio-SPEC := gnuradio.spec
-gnuradio-BUILD-FROM-SRPM := yes
-# boost-devel needs boost !
-gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
-ALL += gnuradio
-IN_BOOTSTRAPFS += gnuradio
+########## this should not be needed with f14 anymore
+#f14# #
+#f14# # boost
+#f14# #
+#f14# # we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
+#f14# # this build is based on the f11 rpm, i.e. boost-1.37
+#f14# #
+#f14# boost-MODULES := boost
+#f14# boost-SPEC := boost.spec
+#f14# boost-BUILD-FROM-SRPM := yes
+#f14# ALL += boost
+#f14# IN_BOOTSTRAPFS += boost
+#f14#
+#f14# #
+#f14# # gnuradio
+#f14# #
+#f14# gnuradio-MODULES := gnuradio
+#f14# gnuradio-SPEC := gnuradio.spec
+#f14# gnuradio-BUILD-FROM-SRPM := yes
+#f14# # boost-devel needs boost !
+#f14# gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
+#f14# ALL += gnuradio
+#f14# IN_BOOTSTRAPFS += gnuradio
#
# bbn
else
kernel-RPMFLAGS:= --target $(HOSTARCH)
endif
-### not needed with 2.6.27 anymore
-### kernel-SPECVARS := iwlwifi=1
+# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
+kernel-SPECVARS += iwlwifi=1
+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)
-
-#-broken-# #
-#-broken-# # ipfw: root context module, and slice companion
-#-broken-# #
-#-broken-# ipfwroot-MODULES := ipfw
-#-broken-# ipfwroot-SPEC := planetlab/ipfwroot.spec
-#-broken-# ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
-#-broken-# ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
-#-broken-# kernel_release=$(kernel.rpm-release) \
-#-broken-# kernel_arch=$(kernel.rpm-arch)
-#-broken-# ALL += ipfwroot
-#-broken-#
-#-broken-# ipfwslice-MODULES := ipfw
-#-broken-# ipfwslice-SPEC := planetlab/ipfwslice.spec
-#-broken-# ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-#-broken-# kernel_release=$(kernel.rpm-release) \
-#-broken-# kernel_arch=$(kernel.rpm-arch)
-#-broken-# ALL += ipfwslice
#
# madwifi
#
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
IN_VSERVER += iproute
IN_BOOTCD += iproute
+#
+# ipfw: root context module, and slice companion
+#
+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
+
+ipfwslice-MODULES := ipfw
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
+ kernel_release=$(kernel.rpm-release) \
+ kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwslice
+
+#
+# umts: root context stuff
+#
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend.spec
+IN_BOOTSTRAPFS += umts-backend
+ALL += umts-backend
+
+#
+# umts: slice tools
+#
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend.spec
+IN_VSERVER += umts-frontend
+ALL += umts-frontend
+
#
# util-vserver
#
#
# NodeManager
#
-nodemanager-MODULES := nodemanager
+nodemanager-MODULES := NodeManager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
IN_BOOTSTRAPFS += nodemanager
#
# codemux: Port 80 demux
#
-codemux-MODULES := codemux
+codemux-MODULES := CoDemux
codemux-SPEC := codemux.spec
-#codemux-RPMBUILD := bash ./rpmbuild.sh
ALL += codemux
IN_BOOTSTRAPFS += codemux
ALL += vsys-scripts
#
-# plcapi
+# PLCAPI
#
plcapi-MODULES := plcapi
plcapi-SPEC := PLCAPI.spec
pcucontrol-SPEC := pcucontrol.spec
ALL += pcucontrol
-#
-# 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
-
-#
-# PLC RT
-#
-plcrt-MODULES := PLCRT
-plcrt-SPEC := plcrt.spec
-ALL += plcrt
-
#
# pyopenssl
#
pyaspects-BUILD-FROM-SRPM := yes
ALL += pyaspects
-#
-# ejabberd
-#
-ejabberd-MODULES := ejabberd
-ejabberd-SPEC := ejabberd.spec
-ejabberd-BUILD-FROM-SRPM := yes
-ALL += ejabberd
-
-# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
-build_sfa=false
-
-ifeq "$(build_sfa)" "true"
-#
-# sfa - Slice Facility Architecture
-#
-sfa-MODULES := sfa
-sfa-SPEC := sfa.spec
-ALL += sfa
-endif
-
#
# nodeconfig
#
IN_MYPLC += 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
#
bootcd-MODULES := bootcd build
bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := bash ./rpmbuild.sh
bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
bootcd-DEPEND-FILES := RPMS/yumgroups.xml
bootcd-RPMDATE := yes
#
bootstrapfs-MODULES := bootstrapfs build
bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-RPMBUILD := bash ./rpmbuild.sh
bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
bootstrapfs-RPMDATE := yes
# noderepo
#
# all rpms resulting from packages marked as being in bootstrapfs and vserver
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms))
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(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-MODULES := bootstrapfs
noderepo-SPEC := noderepo.spec
-noderepo-RPMBUILD := bash ./rpmbuild.sh
-# package requires all embedded packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
+# package requires all regular packages
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
#export rpm list to the specfile
noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
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
-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
#
# 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
git://git.onelab.eu / wextoolbox.git / blobdiff