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
looks like this builds fine, let's enable it
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
043a21c
..
395bc22
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,24
+40,22
@@
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) \
kernel_arch=$(kernel.rpm-arch)
ALL += ipfwslice
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
#
#
# madwifi
#
@@
-72,7
+68,6
@@
madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_arch=$(kernel.rpm-arch)
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
kernel_arch=$(kernel.rpm-arch)
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
-#endif
#
# nozomi
#
# nozomi
@@
-115,6
+110,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
@@
-173,7
+171,7
@@
IN_BOOTSTRAPFS += util-vserver-pl
#
# NodeUpdate
#
#
# NodeUpdate
#
-nodeupdate-MODULES :=
NodeU
pdate
+nodeupdate-MODULES :=
nodeu
pdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
@@
-189,7
+187,7
@@
IN_BOOTSTRAPFS += ipod
#
# NodeManager
#
#
# NodeManager
#
-nodemanager-MODULES :=
NodeM
anager
+nodemanager-MODULES :=
nodem
anager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
IN_BOOTSTRAPFS += nodemanager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
IN_BOOTSTRAPFS += nodemanager
@@
-205,7
+203,7
@@
IN_BOOTSTRAPFS += sshd
#
# codemux: Port 80 demux
#
#
# codemux: Port 80 demux
#
-codemux-MODULES :=
CoD
emux
+codemux-MODULES :=
cod
emux
codemux-SPEC := codemux.spec
#codemux-RPMBUILD := bash ./rpmbuild.sh
ALL += codemux
codemux-SPEC := codemux.spec
#codemux-RPMBUILD := bash ./rpmbuild.sh
ALL += codemux
@@
-219,6
+217,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
#
@@
-251,6
+258,14
@@
IN_BOOTSTRAPFS += inotify-tools
ALL += inotify-tools
endif
ALL += inotify-tools
endif
+#
+# openvswitch
+#
+openvswitch-MODULES := openvswitch
+openvswitch-SPEC := openvswitch.spec
+IN_BOOTSTRAPFS += openvswitch
+ALL += openvswitch
+
#
# vsys
#
#
# vsys
#
@@
-273,9
+288,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
+300,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
+316,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
@@
-350,14
+369,31
@@
ALL += pyaspects
#
ejabberd-MODULES := ejabberd
ejabberd-SPEC := ejabberd.spec
#
ejabberd-MODULES := ejabberd
ejabberd-SPEC := ejabberd.spec
+ejabberd-BUILD-FROM-SRPM := yes
+# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
+# so, this is relevant on f8 and centos5 only
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
ALL += ejabberd
ALL += ejabberd
+endif
+# 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
+
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
#
# nodeconfig
#
# nodeconfig
@@
-365,13
+401,15
@@
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
#
-bootmanager-MODULES :=
BootM
anager
+bootmanager-MODULES :=
bootm
anager
bootmanager-SPEC := bootmanager.spec
ALL += bootmanager
bootmanager-SPEC := bootmanager.spec
ALL += bootmanager
+IN_MYPLC += bootmanager
#
# pypcilib : used in bootcd
#
# pypcilib : used in bootcd
@@
-388,6
+426,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
#
@@
-398,21
+437,29
@@
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
#
-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
ALL += bootcd
bootcd-SPEC := bootcd.spec
bootcd-RPMBUILD := bash ./rpmbuild.sh
bootcd-DEPEND-PACKAGES := $(IN_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
#
-vserver-MODULES :=
VserverR
eference build
+vserver-MODULES :=
vserver-r
eference build
vserver-SPEC := vserver-reference.spec
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml
vserver-SPEC := vserver-reference.spec
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml
@@
-423,33
+470,35
@@
IN_BOOTSTRAPFS += vserver
#
# bootstrapfs
#
#
# 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
ALL += bootstrapfs
bootstrapfs-SPEC := bootstrapfs.spec
bootstrapfs-RPMBUILD := bash ./rpmbuild.sh
bootstrapfs-DEPEND-PACKAGES := $(IN_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))
-noderepo-MODULES :=
BootstrapFS
+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
@@
-460,7
+509,7
@@
SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
SPACE=$(subst x, ,x)
SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
SPACE=$(subst x, ,x)
SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
-slicerepo-MODULES :=
BootstrapFS
+slicerepo-MODULES :=
bootstrapfs
slicerepo-SPEC := slicerepo.spec
slicerepo-RPMBUILD := bash ./rpmbuild.sh
# package requires all embedded packages
slicerepo-SPEC := slicerepo.spec
slicerepo-RPMBUILD := bash ./rpmbuild.sh
# package requires all embedded packages
@@
-474,7
+523,7
@@
ALL += slicerepo
#
# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
#
#
# 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-SPEC := myplc.spec
myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
ALL += myplc
@@
-482,12
+531,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 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 NodeM
anager Monitor
+myplc-docs-MODULES :=
myplc plcapi nodem
anager Monitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs
# using some other name than myplc-release, as this is a make target already
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
release-SPEC := myplc-release.spec
release-RPMDATE := yes
ALL += release