X-Git-Url: http://git.onelab.eu/?p=wextoolbox.git;a=blobdiff_plain;f=wextoolbox.mk;h=9c3e128a9a7a84447d38311ba4b9ddbfae19e697;hp=faa80a361f5708490800734e8f50b37b62f494bc;hb=0ddcfc4862739042acfb13195ccc7ee93dbccdfa;hpb=6c8dafe71165d4eaf8a6e67770e007a7112c93e3 diff --git a/wextoolbox.mk b/wextoolbox.mk index faa80a3..9c3e128 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -5,8 +5,6 @@ # Copyright (C) 2003-2006 The Trustees of Princeton University # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis # -# $Id$ -# ### NOTES on diffs with onelab # 2.6.27 vs 2.6.22 - does not need iwlwifi exception anymore # does not include: @@ -22,38 +20,17 @@ # 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 +IN_NODEIMAGE += bbn # # crunchxml @@ -61,8 +38,9 @@ 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 +IN_NODEIMAGE += crunchxml # # spectools @@ -70,8 +48,23 @@ 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 +IN_NODEIMAGE += spectools + +# +# sge +# +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-to-use distro on centos +# ALL += sge +# IN_NODEIMAGE += sge # # kernel @@ -88,10 +81,7 @@ kernel-RPMFLAGS:= --target i686 else kernel-RPMFLAGS:= --target $(HOSTARCH) endif -### not needed with 2.6.27 anymore -### kernel-SPECVARS := iwlwifi=1 -### tmp -kernel-RPMDATE := yes +kernel-SPECVARS += kernelconfig=planetlab KERNELS += kernel kernels: $(KERNELS) @@ -100,10 +90,24 @@ 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) -# turns out myplc installs kernel-vserver -IN_MYPLC += $(KERNELS) +#IN_SLICEIMAGE += $(KERNELS) +IN_NODEIMAGE += $(KERNELS) + +# +# 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_NODEIMAGE += ipfwroot + +ipfwslice-MODULES := ipfw +ipfwslice-SPEC := planetlab/ipfwslice.spec +ALL += ipfwslice # # madwifi @@ -111,61 +115,65 @@ IN_MYPLC += $(KERNELS) 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 +IN_NODEIMAGE += madwifi # -# util-vserver +# umts: root context stuff # -util-vserver-MODULES := util-vserver -util-vserver-SPEC := util-vserver.spec -util-vserver-RPMFLAGS:= --without dietlibc -ALL += util-vserver -IN_BOOTSTRAPFS += util-vserver +umts-backend-MODULES := planetlab-umts-tools +umts-backend-SPEC := backend.spec +IN_NODEIMAGE += umts-backend +ALL += umts-backend # -# libnl - local import -# we need either 1.1 or at least 1.0.pre6 -# rebuild this on centos5 - see kexcludes in build.common +# umts: slice tools # -local_libnl=false -ifeq "$(DISTRONAME)" "centos5" -local_libnl=true -endif +umts-frontend-MODULES := planetlab-umts-tools +umts-frontend-SPEC := frontend.spec +IN_SLICEIMAGE += umts-frontend +ALL += umts-frontend -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 +# +# iptables +# +iptables-MODULES := iptables +iptables-SPEC := iptables.spec +iptables-BUILD-FROM-SRPM := yes +iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers +ALL += iptables +IN_NODEIMAGE += iptables + +# +# util-vserver +# +util-vserver-MODULES := util-vserver +util-vserver-SPEC := util-vserver.spec +util-vserver-BUILD-FROM-SRPM := yes +util-vserver-RPMFLAGS:= --without dietlibc --without doc +ALL += util-vserver +IN_NODEIMAGE += util-vserver # # 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 +IN_NODEIMAGE += util-vserver-pl # # NodeUpdate # -nodeupdate-MODULES := NodeUpdate +nodeupdate-MODULES := nodeupdate nodeupdate-SPEC := NodeUpdate.spec ALL += nodeupdate -IN_BOOTSTRAPFS += nodeupdate +IN_NODEIMAGE += nodeupdate # # ipod @@ -173,15 +181,28 @@ IN_BOOTSTRAPFS += nodeupdate ipod-MODULES := PingOfDeath ipod-SPEC := ipod.spec ALL += ipod -IN_BOOTSTRAPFS += ipod +IN_NODEIMAGE += ipod + +# +# plnode-utils +# +plnode-utils-MODULES := plnode-utils +plnode-utils-SPEC := plnode-utils-vs.spec +ALL += plnode-utils +IN_NODEIMAGE += plnode-utils # -# NodeManager +# nodemanager # -nodemanager-MODULES := NodeManager -nodemanager-SPEC := NodeManager.spec -ALL += nodemanager -IN_BOOTSTRAPFS += nodemanager +nodemanager-lib-MODULES := nodemanager +nodemanager-lib-SPEC := nodemanager-lib.spec +ALL += nodemanager-lib +IN_NODEIMAGE += nodemanager-lib + +nodemanager-vs-MODULES := nodemanager +nodemanager-vs-SPEC := nodemanager-vs.spec +ALL += nodemanager-vs +IN_NODEIMAGE += nodemanager-vs # # pl_sshd @@ -189,16 +210,15 @@ IN_BOOTSTRAPFS += nodemanager sshd-MODULES := pl_sshd sshd-SPEC := pl_sshd.spec ALL += sshd -IN_BOOTSTRAPFS += sshd +IN_NODEIMAGE += sshd # # codemux: Port 80 demux # -codemux-MODULES := CoDemux +codemux-MODULES := codemux codemux-SPEC := codemux.spec -codemux-RPMBUILD := sudo bash ./rpmbuild.sh ALL += codemux -IN_BOOTSTRAPFS += codemux +IN_NODEIMAGE += codemux # # fprobe-ulog @@ -206,7 +226,7 @@ IN_BOOTSTRAPFS += codemux fprobe-ulog-MODULES := fprobe-ulog fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog -IN_BOOTSTRAPFS += fprobe-ulog +IN_NODEIMAGE += fprobe-ulog # # pf2slice @@ -218,73 +238,70 @@ ALL += pf2slice # # PlanetLab Mom: Cleans up your mess # -mom-MODULES := Mom +mom-MODULES := mom mom-SPEC := pl_mom.spec ALL += mom -IN_BOOTSTRAPFS += mom +IN_NODEIMAGE += mom # -# iptables +# vsys # -iptables-MODULES := iptables -iptables-SPEC := iptables.spec -iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers -ALL += iptables -IN_BOOTSTRAPFS += iptables +vsys-MODULES := vsys +vsys-SPEC := vsys.spec +vsys-DEVEL-RPMS += ocaml-ocamldoc +IN_NODEIMAGE += vsys +ALL += vsys # -# iproute +# vsyssh : installed in slivers # -iproute-MODULES := iproute2 -iproute-SPEC := iproute.spec -ALL += iproute -IN_BOOTSTRAPFS += iproute -IN_VSERVER += iproute -IN_BOOTCD += iproute +vsyssh-MODULES := vsys +vsyssh-SPEC := vsyssh.spec +IN_SLICEIMAGE += vsyssh +ALL += vsyssh # -# inotify-tools - local import -# rebuild this on centos5 (not found) - see kexcludes in build.common +# vsys-scripts # -local_inotify_tools=false -ifeq "$(DISTRONAME)" "centos5" -local_inotify_tools=true -endif +vsys-scripts-MODULES := vsys-scripts +vsys-scripts-SPEC := root-context/vsys-scripts.spec +IN_NODEIMAGE += vsys-scripts +ALL += vsys-scripts -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-wrapper-MODULES := vsys-scripts +vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec +IN_SLICEIMAGE += vsys-wrapper +ALL += vsys-wrapper # -# vsys +# autoconf # -vsys-MODULES := vsys -vsys-SPEC := vsys.spec -ifeq "$(local_inotify_tools)" "true" -vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel +# openvswitch requires an autoconf more recent than what f12 has +ifeq "$(DISTRONAME)" "f12" +autoconf-MODULES := autoconf +autoconf-SPEC := autoconf.spec +autoconf-BUILD-FROM-SRPM := yes +ALL += autoconf endif -IN_BOOTSTRAPFS += vsys -ALL += vsys # -# vsys-scripts +# sliver-openvswitch # -vsys-scripts-MODULES := vsys-scripts -vsys-scripts-SPEC := vsys-scripts.spec -IN_BOOTSTRAPFS += vsys-scripts -ALL += vsys-scripts +sliver-openvswitch-MODULES := sliver-openvswitch +sliver-openvswitch-SPEC := sliver-openvswitch.spec +ifeq "$(DISTRONAME)" "f12" +sliver-openvswitch-DEPEND-DEVEL-RPMS-UPDATES := autoconf +endif +IN_SLICEIMAGE += sliver-openvswitch +ALL += sliver-openvswitch # -# PLCAPI +# plcapi # -PLCAPI-MODULES := PLCAPI -PLCAPI-SPEC := PLCAPI.spec -ALL += PLCAPI -IN_MYPLC += PLCAPI +plcapi-MODULES := plcapi +plcapi-SPEC := PLCAPI.spec +ALL += plcapi +IN_MYPLC += plcapi # # drupal @@ -298,7 +315,7 @@ IN_MYPLC += drupal # # use the plewww module instead # -plewww-MODULES := PLEWWW +plewww-MODULES := plewww plewww-SPEC := plewww.spec ALL += plewww IN_MYPLC += plewww @@ -312,27 +329,11 @@ ALL += www-register-wizard IN_MYPLC += www-register-wizard # -# monitor +# pcucontrol # -monitor-MODULES := Monitor -monitor-SPEC := Monitor.spec -ALL += monitor -IN_BOOTSTRAPFS += monitor - -# -# PLC RT -# -plcrt-MODULES := PLCRT -plcrt-SPEC := plcrt.spec -ALL += plcrt - -# -# zabbix -# -zabbix-MODULES := Monitor -zabbix-SPEC := zabbix.spec -zabbix-BUILD-FROM-SRPM := yes -ALL += zabbix +pcucontrol-MODULES := pcucontrol +pcucontrol-SPEC := pcucontrol.spec +ALL += pcucontrol # # pyopenssl @@ -342,18 +343,18 @@ pyopenssl-SPEC := pyOpenSSL.spec pyopenssl-BUILD-FROM-SRPM := yes ALL += pyopenssl - # -# sfa - Slice Facility Architecture +# pyaspects # -sfa-MODULES := sfa -sfa-SPEC := sfa.spec -ALL += sfa +pyaspects-MODULES := pyaspects +pyaspects-SPEC := pyaspects.spec +pyaspects-BUILD-FROM-SRPM := yes +ALL += pyaspects # # nodeconfig # -nodeconfig-MODULES := nodeconfig build +nodeconfig-MODULES := nodeconfig nodeconfig-SPEC := nodeconfig.spec ALL += nodeconfig IN_MYPLC += nodeconfig @@ -361,7 +362,7 @@ IN_MYPLC += nodeconfig # # bootmanager # -bootmanager-MODULES := BootManager +bootmanager-MODULES := bootmanager bootmanager-SPEC := bootmanager.spec ALL += bootmanager IN_MYPLC += bootmanager @@ -380,16 +381,38 @@ IN_BOOTCD += pypcilib pyplnet-MODULES := pyplnet pyplnet-SPEC := pyplnet.spec ALL += pyplnet -IN_BOOTSTRAPFS += pyplnet +IN_NODEIMAGE += pyplnet IN_MYPLC += pyplnet IN_BOOTCD += pyplnet +# +# OMF resource controller +# +omf-resctl-MODULES := omf +omf-resctl-SPEC := omf-resctl.spec +ALL += omf-resctl +IN_SLICEIMAGE += 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 := sudo bash ./rpmbuild.sh bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) bootcd-DEPEND-FILES := RPMS/yumgroups.xml bootcd-RPMDATE := yes @@ -397,42 +420,49 @@ ALL += bootcd IN_MYPLC += bootcd # -# vserver : reference image for slices +# images for slices # -vserver-MODULES := VserverReference build -vserver-SPEC := vserver-reference.spec -vserver-DEPEND-PACKAGES := $(IN_VSERVER) -vserver-DEPEND-FILES := RPMS/yumgroups.xml -vserver-RPMDATE := yes -ALL += vserver -IN_BOOTSTRAPFS += vserver +sliceimage-MODULES := sliceimage build +sliceimage-SPEC := sliceimage.spec +sliceimage-DEPEND-PACKAGES := $(IN_SLICEIMAGE) +sliceimage-DEPEND-FILES := RPMS/yumgroups.xml +sliceimage-RPMDATE := yes +ALL += sliceimage +IN_NODEIMAGE += sliceimage # -# bootstrapfs +# vserver-specific sliceimage initialization +# +vserver-sliceimage-MODULES := sliceimage +vserver-sliceimage-SPEC := vserver-sliceimage.spec +vserver-sliceimage-RPMDATE := yes +ALL += vserver-sliceimage +IN_NODEIMAGE += vserver-sliceimage + +# +# nodeimage # -bootstrapfs-MODULES := BootstrapFS build -bootstrapfs-SPEC := bootstrapfs.spec -bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh -bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) -bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml -bootstrapfs-RPMDATE := yes -ALL += bootstrapfs -IN_MYPLC += bootstrapfs +nodeimage-MODULES := nodeimage build +nodeimage-SPEC := nodeimage.spec +nodeimage-DEPEND-PACKAGES := $(IN_NODEIMAGE) +nodeimage-DEPEND-FILES := RPMS/yumgroups.xml +nodeimage-RPMDATE := yes +ALL += nodeimage +IN_MYPLC += nodeimage # # noderepo # -# all rpms resulting from packages marked as being in bootstrapfs and vserver -NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms)) +# all rpms resulting from packages marked as being in nodeimage and sliceimage +NODEREPO_RPMS = $(foreach package,$(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE),$($(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 := nodeimage noderepo-SPEC := noderepo.spec -noderepo-RPMBUILD := sudo bash ./rpmbuild.sh -# package requires all regular packages -noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER) +# package requires all embedded packages +noderepo-DEPEND-PACKAGES := $(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE) noderepo-DEPEND-FILES := RPMS/yumgroups.xml #export rpm list to the specfile noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS) @@ -440,10 +470,29 @@ noderepo-RPMDATE := yes ALL += noderepo IN_MYPLC += noderepo +# +# slicerepo +# +# all rpms resulting from packages marked as being in vserver +SLICEREPO_RPMS = $(foreach package,$(IN_SLICEIMAGE),$($(package).rpms)) +# replace space with +++ (specvars cannot deal with spaces) +SPACE=$(subst x, ,x) +SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS)) + +slicerepo-MODULES := nodeimage +slicerepo-SPEC := slicerepo.spec +# package requires all embedded packages +slicerepo-DEPEND-PACKAGES := $(IN_SLICEIMAGE) +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 build +myplc-MODULES := myplc myplc-SPEC := myplc.spec myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml ALL += myplc @@ -451,12 +500,12 @@ 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