X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=f11f49f50341fd059faa442aa3f071836ad463ec;hb=6cfa4066f86629ea89c86826f998f18d0e0a095d;hp=f0d4b743a4f5a05258f1af260dbcf44743fc50e8;hpb=0726c4761addc79f61b3c44cdd4e6051e47fbc27;p=build.git diff --git a/onelab.mk b/onelab.mk index f0d4b743..f11f49f5 100644 --- a/onelab.mk +++ b/onelab.mk @@ -5,8 +5,6 @@ # Copyright (C) 2003-2006 The Trustees of Princeton University # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis # -# $Id$ -# # see doc in Makefile # @@ -25,7 +23,9 @@ kernel-RPMFLAGS:= --target i686 else kernel-RPMFLAGS:= --target $(HOSTARCH) endif -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) @@ -36,9 +36,29 @@ ALL += $(KERNELS) IN_BOOTCD += $(KERNELS) IN_VSERVER += $(KERNELS) IN_BOOTSTRAPFS += $(KERNELS) -# turns out myplc installs kernel-vserver -IN_MYPLC += $(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_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 + +# this doesn't build on f12 - weird all right - I suspect gcc to be smarter but that needs investigation +# is madwifi still current anyway ? should we move to ath5k instead ? +#ifneq "$(DISTRONAME)" "f12" # # madwifi # @@ -51,6 +71,7 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_arch=$(kernel.rpm-arch) ALL += madwifi IN_BOOTSTRAPFS += madwifi +#endif # # nozomi @@ -72,6 +93,44 @@ comgt-SPEC := comgt.spec IN_BOOTSTRAPFS += comgt ALL += comgt +# +# 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 +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 # @@ -84,7 +143,7 @@ IN_BOOTSTRAPFS += util-vserver # # libnl - local import # we need either 1.1 or at least 1.0.pre6 -# rebuild this on f8 and centos5 - see kexcludes in build.common +# rebuild this on centos5 - see kexcludes in build.common # local_libnl=false ifeq "$(DISTRONAME)" "centos5" @@ -95,6 +154,8 @@ 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 @@ -130,7 +191,7 @@ IN_BOOTSTRAPFS += ipod # # NodeManager # -nodemanager-MODULES := NodeManager +nodemanager-MODULES := nodemanager nodemanager-SPEC := NodeManager.spec ALL += nodemanager IN_BOOTSTRAPFS += nodemanager @@ -146,9 +207,9 @@ IN_BOOTSTRAPFS += sshd # # codemux: Port 80 demux # -codemux-MODULES := CoDemux +codemux-MODULES := codemux codemux-SPEC := codemux.spec -codemux-RPMBUILD := sudo bash ./rpmbuild.sh +#codemux-RPMBUILD := bash ./rpmbuild.sh ALL += codemux IN_BOOTSTRAPFS += codemux @@ -160,6 +221,15 @@ fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_BOOTSTRAPFS += fprobe-ulog +# +# DistributedRateLimiting +# +DistributedRateLimiting-MODULES := DistributedRateLimiting +DistributedRateLimiting-SPEC := DistributedRateLimiting.spec +ALL += DistributedRateLimiting +IN_NODEREPO += DistributedRateLimiting + + # # pf2slice # @@ -175,67 +245,81 @@ mom-SPEC := pl_mom.spec ALL += mom IN_BOOTSTRAPFS += mom -# -# iptables -# -iptables-MODULES := iptables -iptables-SPEC := iptables.spec -iptables-DEPEND-DEVEL-RPMS := kernel-devel -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 -# could not find this in cen +# 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 +ifeq "$(local_inotify_tools)" "true" vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel +endif IN_BOOTSTRAPFS += vsys ALL += vsys # -# dummynet_image +# vsys-scripts +# +vsys-scripts-MODULES := vsys-scripts +vsys-scripts-SPEC := vsys-scripts.spec +IN_BOOTSTRAPFS += vsys-scripts +ALL += vsys-scripts + +# +# plcapi +# +plcapi-MODULES := plcapi +plcapi-SPEC := PLCAPI.spec +ALL += plcapi +IN_MYPLC += plcapi + +# +# drupal # -dummynet_image-MODULES := dummynet_image -dummynet_image-SPEC := dummynet_image.spec -IN_MYPLC += dummynet_image -ALL += dummynet_image +drupal-MODULES := drupal +drupal-SPEC := drupal.spec +drupal-BUILD-FROM-SRPM := yes +ALL += drupal +IN_MYPLC += drupal + +# +# use the plewww module instead +# +plewww-MODULES := plewww +plewww-SPEC := plewww.spec +ALL += plewww +IN_MYPLC += plewww # -# PLCAPI +# www-register-wizard # -PLCAPI-MODULES := PLCAPI -PLCAPI-SPEC := PLCAPI.spec -ALL += PLCAPI -IN_MYPLC += PLCAPI +www-register-wizard-MODULES := www-register-wizard +www-register-wizard-SPEC := www-register-wizard.spec +ALL += www-register-wizard +IN_MYPLC += www-register-wizard # -# PLCWWW +# pcucontrol # -PLCWWW-MODULES := PLCWWW -PLCWWW-SPEC := PLCWWW.spec -ALL += PLCWWW -IN_MYPLC += PLCWWW +pcucontrol-MODULES := pcucontrol +pcucontrol-SPEC := pcucontrol.spec +ALL += pcucontrol # # monitor @@ -246,16 +330,63 @@ ALL += monitor IN_BOOTSTRAPFS += monitor # -# monitor-server +# zabbix # -monitor-server-MODULES := Monitor -monitor-server-SPEC := monitor-server.spec -ALL += monitor-server +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 +# +pyopenssl-MODULES := pyopenssl +pyopenssl-SPEC := pyOpenSSL.spec +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 now uses the with statement that's not supported on python-2.4 - not even through __future__ +build_sfa=true +ifeq "$(DISTRONAME)" "centos5" +build_sfa=false +endif + +ifeq "$(build_sfa)" "true" +# +# sfa - Slice Facility Architecture +# +sfa-MODULES := sfa +sfa-SPEC := sfa.spec +ALL += sfa +endif # # nodeconfig # -nodeconfig-MODULES := nodeconfig build +nodeconfig-MODULES := nodeconfig nodeconfig-SPEC := nodeconfig.spec ALL += nodeconfig IN_MYPLC += nodeconfig @@ -263,7 +394,7 @@ IN_MYPLC += nodeconfig # # bootmanager # -bootmanager-MODULES := BootManager +bootmanager-MODULES := bootmanager bootmanager-SPEC := bootmanager.spec ALL += bootmanager IN_MYPLC += bootmanager @@ -276,12 +407,37 @@ pypcilib-SPEC := pypcilib.spec ALL += pypcilib IN_BOOTCD += pypcilib +# +# pyplnet +# +pyplnet-MODULES := pyplnet +pyplnet-SPEC := pyplnet.spec +ALL += pyplnet +IN_BOOTSTRAPFS += pyplnet +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-MODULES := bootcd build bootcd-SPEC := bootcd.spec -bootcd-RPMBUILD := sudo bash ./rpmbuild.sh +bootcd-RPMBUILD := bash ./rpmbuild.sh bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) bootcd-DEPEND-FILES := RPMS/yumgroups.xml bootcd-RPMDATE := yes @@ -291,10 +447,8 @@ IN_MYPLC += bootcd # # vserver : reference image for slices # -vserver-MODULES := VserverReference build +vserver-MODULES := vserverreference build vserver-SPEC := vserver-reference.spec -# Package must be built as root -vserver-RPMBUILD := sudo bash ./rpmbuild.sh vserver-DEPEND-PACKAGES := $(IN_VSERVER) vserver-DEPEND-FILES := RPMS/yumgroups.xml vserver-RPMDATE := yes @@ -304,9 +458,9 @@ IN_BOOTSTRAPFS += vserver # # bootstrapfs # -bootstrapfs-MODULES := BootstrapFS build +bootstrapfs-MODULES := bootstrapfs build bootstrapfs-SPEC := bootstrapfs.spec -bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh +bootstrapfs-RPMBUILD := bash ./rpmbuild.sh bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml bootstrapfs-RPMDATE := yes @@ -317,16 +471,16 @@ IN_MYPLC += bootstrapfs # 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-MODULES := bootstrapfs noderepo-SPEC := noderepo.spec -noderepo-RPMBUILD := sudo bash ./rpmbuild.sh -# package requires all regular packages -noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER) +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 #export rpm list to the specfile noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS) @@ -335,31 +489,42 @@ ALL += noderepo IN_MYPLC += noderepo # -# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver -# -myplc-native-MODULES := MyPLC build -myplc-native-SPEC := myplc-native.spec -# Package must be built as root -myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh -myplc-native-DEPEND-FILES := myplc-release RPMS/yumgroups.xml -ALL += myplc-native - -## # -## # myplc : old-fashioned, chroot-based packaging -## # -## myplc-MODULES := MyPLC build -## myplc-SPEC := myplc.spec -## # Package must be built as root -## myplc-RPMBUILD := sudo bash ./rpmbuild.sh -## # myplc may require all packages -## myplc-DEPEND-PACKAGES := $(IN_MYPLC) -## myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release -## myplc-RPMDATE := yes -## ALL += myplc +# 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-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 +myplc-docs-MODULES := myplc plcapi nodemanager Monitor 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-SPEC := myplc-release.spec +release-RPMDATE := yes +ALL += release