# 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
-
#
# bbn
#
bbn-MODULES := bbn_80211
bbn-SPEC := bbn_80211.spec
bbn-BUILD-FROM-SRPM := yes
-bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
+# now from the stock repo
+bbn-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel swig
+#bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
ALL += bbn
IN_BOOTSTRAPFS += bbn
crunchxml-MODULES := crunchxml
crunchxml-SPEC := crunchxml.spec
crunchxml-BUILD-FROM-SRPM := yes
+crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons
ALL += crunchxml
IN_BOOTSTRAPFS += crunchxml
spectools-MODULES := spectools
spectools-SPEC := spectools.spec
spectools-BUILD-FROM-SRPM := yes
+spectools-DEVEL-RPMS := gtk2-devel
ALL += spectools
IN_BOOTSTRAPFS += spectools
sge-MODULES := sge
sge-SPEC := sge.spec
sge-BUILD-FROM-SRPM := yes
+sge-DEVEL-RPMS += kdevelop-devel kdevelop kdevelop-libs java-1.6.0-openjdk
+sge-DEVEL-RPMS += lesstif lesstif-devel
+
# turning this off - current focus is on deploying the sge box separately from myplc
-# packaging is still broken, and we're exploring a ready-t-o-use distro on centos
+# packaging is still broken, and we're exploring a ready-to-use distro on centos
# ALL += sge
# IN_BOOTSTRAPFS += sge
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
+
+#
+# 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
+IN_BOOTSTRAPFS += 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
#
# madwifi
madwifi-MODULES := madwifi
madwifi-SPEC := madwifi.spec
madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS := kernel-devel
+madwifi-DEPEND-DEVEL-RPMS += kernel-devel
madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
+#
+# 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
+
#
# iptables
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
-iptables-BUILD-FROM-SRPM := yes
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+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
-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-BUILD-FROM-SRPM := yes
util-vserver-RPMFLAGS:= --without dietlibc
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
-#
-local_libnl=false
-ifeq "$(DISTRONAME)" "centos5"
-local_libnl=true
-endif
-
-ifeq "$(local_libnl)" "true"
-libnl-MODULES := libnl
-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 kernel-headers
-ALL += libnl
-IN_BOOTSTRAPFS += libnl
-endif
-
#
# util-vserver-pl
#
util-vserver-pl-MODULES := util-vserver-pl
util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core
-ifeq "$(local_libnl)" "true"
-util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
-endif
+util-vserver-pl-DEPEND-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core
ALL += util-vserver-pl
IN_BOOTSTRAPFS += util-vserver-pl
#
# NodeUpdate
#
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
#
# 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 += mom
IN_BOOTSTRAPFS += mom
-#
-# inotify-tools - local import
-# 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
+vsys-DEVEL-RPMS += ocaml-ocamldoc
ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
+vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
endif
IN_BOOTSTRAPFS += vsys
ALL += vsys
#
# plcapi
#
-plcapi-MODULES := PLCAPI
+plcapi-MODULES := plcapi
plcapi-SPEC := PLCAPI.spec
ALL += plcapi
IN_MYPLC += plcapi
#
# use the plewww module instead
#
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
plewww-SPEC := plewww.spec
ALL += plewww
IN_MYPLC += plewww
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
-#
-# 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
#
#
# bootmanager
#
-bootmanager-MODULES := BootManager
+bootmanager-MODULES := bootmanager
bootmanager-SPEC := bootmanager.spec
ALL += bootmanager
IN_MYPLC += bootmanager
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
+
+#
+# OML measurement library
+#
+oml-MODULES := oml
+oml-DEVEL-RPMS += sqlite-devel
+oml-SPEC := liboml.spec
+ALL += oml
+
#
# bootcd
#
-bootcd-MODULES := BootCD build
+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
#
# vserver : reference image for slices
#
-vserver-MODULES := VserverReference build
+vserver-MODULES := vserver-reference build
vserver-SPEC := vserver-reference.spec
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml
#
# bootstrapfs
#
-bootstrapfs-MODULES := BootstrapFS build
+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
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)
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
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-MODULES := MyPLC
+myplc-MODULES := myplc
myplc-SPEC := myplc.spec
myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
ALL += myplc
# 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
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-MODULES := myplc
release-SPEC := myplc-release.spec
release-RPMDATE := yes
ALL += release
git://git.onelab.eu / wextoolbox.git / blobdiff