git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
using bootcd trunk
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
49dca97
..
edac14f
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-1,5
+1,3
@@
-# $Id$
-# $URL$
#
# declare the packages to be built and their dependencies
# initial version from Mark Huang
#
# declare the packages to be built and their dependencies
# initial version from Mark Huang
@@
-42,15
+40,16
@@
IN_BOOTSTRAPFS += $(KERNELS)
#
# ipfw: root context module, and slice companion
#
#
# ipfw: root context module, and slice companion
#
-ipfwroot-MODULES := ipfw
src
+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
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
src
+ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
ipfwslice-SPEC := planetlab/ipfwslice.spec
ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
@@
-115,6
+114,9
@@
ALL += umts-frontend
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
#
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
iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
ALL += iptables
IN_BOOTSTRAPFS += iptables
@@
-219,6
+221,15
@@
fprobe-ulog-SPEC := fprobe-ulog.spec
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
+#
+# DistributedRateLimiting
+#
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
+
+
#
# pf2slice
#
#
# pf2slice
#
@@
-273,9
+284,10
@@
ALL += vsys-scripts
#
# plcapi
#
#
# plcapi
#
-plcapi-MODULES :=
PLCAPI
+plcapi-MODULES :=
plcapi
plcapi-SPEC := PLCAPI.spec
ALL += plcapi
plcapi-SPEC := PLCAPI.spec
ALL += plcapi
+IN_MYPLC += plcapi
#
# drupal
#
# drupal
@@
-284,13
+296,15
@@
drupal-MODULES := drupal
drupal-SPEC := drupal.spec
drupal-BUILD-FROM-SRPM := yes
ALL += drupal
drupal-SPEC := drupal.spec
drupal-BUILD-FROM-SRPM := yes
ALL += drupal
+IN_MYPLC += drupal
#
# use the plewww module instead
#
#
# use the plewww module instead
#
-plewww-MODULES :=
PLEWWW
+plewww-MODULES :=
plewww
plewww-SPEC := plewww.spec
ALL += plewww
plewww-SPEC := plewww.spec
ALL += plewww
+IN_MYPLC += plewww
#
# www-register-wizard
#
# www-register-wizard
@@
-298,6
+312,7
@@
ALL += plewww
www-register-wizard-MODULES := www-register-wizard
www-register-wizard-SPEC := www-register-wizard.spec
ALL += www-register-wizard
www-register-wizard-MODULES := www-register-wizard
www-register-wizard-SPEC := www-register-wizard.spec
ALL += www-register-wizard
+IN_MYPLC += www-register-wizard
#
# pcucontrol
#
# pcucontrol
@@
-353,12
+368,20
@@
ejabberd-SPEC := ejabberd.spec
ejabberd-BUILD-FROM-SRPM := yes
ALL += ejabberd
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
#
# sfa - Slice Facility Architecture
#
sfa-MODULES := sfa
sfa-SPEC := sfa.spec
ALL += sfa
+endif
#
# nodeconfig
#
# nodeconfig
@@
-366,6
+389,7
@@
ALL += sfa
nodeconfig-MODULES := nodeconfig
nodeconfig-SPEC := nodeconfig.spec
ALL += nodeconfig
nodeconfig-MODULES := nodeconfig
nodeconfig-SPEC := nodeconfig.spec
ALL += nodeconfig
+IN_MYPLC += nodeconfig
#
# bootmanager
#
# bootmanager
@@
-373,6
+397,7
@@
ALL += nodeconfig
bootmanager-MODULES := BootManager
bootmanager-SPEC := bootmanager.spec
ALL += bootmanager
bootmanager-MODULES := BootManager
bootmanager-SPEC := bootmanager.spec
ALL += bootmanager
+IN_MYPLC += bootmanager
#
# pypcilib : used in bootcd
#
# pypcilib : used in bootcd
@@
-389,6
+414,7
@@
pyplnet-MODULES := pyplnet
pyplnet-SPEC := pyplnet.spec
ALL += pyplnet
IN_BOOTSTRAPFS += pyplnet
pyplnet-SPEC := pyplnet.spec
ALL += pyplnet
IN_BOOTSTRAPFS += pyplnet
+IN_MYPLC += pyplnet
IN_BOOTCD += pyplnet
#
IN_BOOTCD += pyplnet
#
@@
-399,6
+425,13
@@
omf-resctl-SPEC := omf-resctl.spec
ALL += omf-resctl
IN_VSERVER += omf-resctl
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
#
@@
-409,6
+442,7
@@
bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
bootcd-DEPEND-FILES := RPMS/yumgroups.xml
bootcd-RPMDATE := yes
ALL += bootcd
bootcd-DEPEND-FILES := RPMS/yumgroups.xml
bootcd-RPMDATE := yes
ALL += bootcd
+IN_MYPLC += bootcd
#
# vserver : reference image for slices
#
# vserver : reference image for slices
@@
-431,12
+465,13
@@
bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
bootstrapfs-RPMDATE := yes
ALL += bootstrapfs
bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
bootstrapfs-RPMDATE := yes
ALL += bootstrapfs
+IN_MYPLC += bootstrapfs
#
# noderepo
#
# all rpms resulting from packages marked as being in bootstrapfs and vserver
#
# 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))
# replace space with +++ (specvars cannot deal with spaces)
SPACE=$(subst x, ,x)
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
@@
-445,12
+480,13
@@
noderepo-MODULES := BootstrapFS
noderepo-SPEC := noderepo.spec
noderepo-RPMBUILD := bash ./rpmbuild.sh
# package requires all embedded packages
noderepo-SPEC := noderepo.spec
noderepo-RPMBUILD := bash ./rpmbuild.sh
# package requires all embedded packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+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)
noderepo-RPMDATE := yes
ALL += noderepo
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
#export rpm list to the specfile
noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
noderepo-RPMDATE := yes
ALL += noderepo
+IN_MYPLC += noderepo
#
# slicerepo
#
# slicerepo
@@
-483,7
+519,7
@@
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 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
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs