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
Merge branch 'master' of ssh://git.onelab.eu/git/build
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
1d1d78f
..
bc2376f
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
@@
-44,7
+42,7
@@
IN_BOOTSTRAPFS += $(KERNELS)
#
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
#
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
-ipfwroot-DEPEND-DEVEL-RPMS
:
= kernel-devel
+ipfwroot-DEPEND-DEVEL-RPMS
+
= kernel-devel
ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
@@
-58,29
+56,25
@@
ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_arch=$(kernel.rpm-arch)
ALL += ipfwslice
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-MODULES := madwifi
madwifi-SPEC := madwifi.spec
madwifi-BUILD-FROM-SRPM := yes
#
# 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
madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
-#endif
#
# nozomi
#
nozomi-MODULES := nozomi
nozomi-SPEC := nozomi.spec
#
# nozomi
#
nozomi-MODULES := nozomi
nozomi-SPEC := nozomi.spec
-nozomi-DEPEND-DEVEL-RPMS
:
= kernel-devel
+nozomi-DEPEND-DEVEL-RPMS
+
= kernel-devel
nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
@@
-116,10
+110,7
@@
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
+iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
ALL += iptables
IN_BOOTSTRAPFS += iptables
ALL += iptables
IN_BOOTSTRAPFS += iptables
@@
-157,7
+148,7
@@
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-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
+libnl-DEPEND-DEVEL-RPMS
+
= kernel-devel kernel-headers
ALL += libnl
IN_BOOTSTRAPFS += libnl
endif
ALL += libnl
IN_BOOTSTRAPFS += libnl
endif
@@
-167,7
+158,7
@@
endif
#
util-vserver-pl-MODULES := util-vserver-pl
util-vserver-pl-SPEC := util-vserver-pl.spec
#
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
+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
ifeq "$(local_libnl)" "true"
util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
endif
@@
-177,7
+168,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
@@
-193,7
+184,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
@@
-209,9
+200,8
@@
IN_BOOTSTRAPFS += sshd
#
# codemux: Port 80 demux
#
#
# codemux: Port 80 demux
#
-codemux-MODULES :=
CoD
emux
+codemux-MODULES :=
cod
emux
codemux-SPEC := codemux.spec
codemux-SPEC := codemux.spec
-#codemux-RPMBUILD := bash ./rpmbuild.sh
ALL += codemux
IN_BOOTSTRAPFS += codemux
ALL += codemux
IN_BOOTSTRAPFS += codemux
@@
-264,13
+254,24
@@
IN_BOOTSTRAPFS += inotify-tools
ALL += inotify-tools
endif
ALL += inotify-tools
endif
+#
+# openvswitch
+#
+openvswitch-MODULES := openvswitch
+openvswitch-SPEC := openvswitch.spec
+openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+IN_BOOTSTRAPFS += openvswitch
+ALL += openvswitch
+
#
# vsys
#
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
#
# vsys
#
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
+# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
+vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
ifeq "$(local_inotify_tools)" "true"
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
endif
IN_BOOTSTRAPFS += vsys
ALL += vsys
@@
-286,9
+287,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
@@
-297,13
+299,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
@@
-311,6
+315,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
@@
-324,6
+329,7
@@
ALL += pcucontrol
#
monitor-MODULES := Monitor
monitor-SPEC := Monitor.spec
#
monitor-MODULES := Monitor
monitor-SPEC := Monitor.spec
+monitor-DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
IN_BOOTSTRAPFS += monitor
ALL += monitor
IN_BOOTSTRAPFS += monitor
@@
-333,6
+339,7
@@
IN_BOOTSTRAPFS += monitor
zabbix-MODULES := Monitor
zabbix-SPEC := zabbix.spec
zabbix-BUILD-FROM-SRPM := yes
zabbix-MODULES := Monitor
zabbix-SPEC := zabbix.spec
zabbix-BUILD-FROM-SRPM := yes
+zabbix-DEVEL-RPMS += python-cherrypy
ALL += zabbix
#
ALL += zabbix
#
@@
-364,14
+371,31
@@
ALL += pyaspects
ejabberd-MODULES := ejabberd
ejabberd-SPEC := ejabberd.spec
ejabberd-BUILD-FROM-SRPM := yes
ejabberd-MODULES := ejabberd
ejabberd-SPEC := ejabberd.spec
ejabberd-BUILD-FROM-SRPM := yes
+ejabberd-DEVEL-RPMS += erlang pam-devel hevea
+# 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
@@
-379,13
+403,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
@@
-402,6
+428,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
#
@@
-419,21
+446,29
@@
omf-expctl-MODULES := omf
omf-expctl-SPEC := omf-expctl.spec
ALL += omf-expctl
omf-expctl-SPEC := omf-expctl.spec
ALL += omf-expctl
+#
+# OML measurement library
+#
+oml-MODULES := oml
+oml-DEVEL-RPMS += sqlite-devel libpcap-devel check
+oml-SPEC := liboml.spec
+ALL += oml
+
#
# bootcd
#
#
# bootcd
#
-bootcd-MODULES :=
BootCD
build
+bootcd-MODULES :=
bootcd
build
bootcd-SPEC := bootcd.spec
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-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
@@
-444,13
+479,13
@@
IN_BOOTSTRAPFS += vserver
#
# bootstrapfs
#
#
# bootstrapfs
#
-bootstrapfs-MODULES :=
BootstrapFS
build
+bootstrapfs-MODULES :=
bootstrapfs
build
bootstrapfs-SPEC := bootstrapfs.spec
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-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
bootstrapfs-RPMDATE := yes
ALL += bootstrapfs
+IN_MYPLC += bootstrapfs
#
# noderepo
#
# noderepo
@@
-461,9
+496,8
@@
NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
SPACE=$(subst x, ,x)
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
SPACE=$(subst x, ,x)
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
-noderepo-MODULES :=
BootstrapFS
+noderepo-MODULES :=
bootstrapfs
noderepo-SPEC := noderepo.spec
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
# package requires all embedded packages
noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
@@
-471,6
+505,7
@@
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
noderepo-RPMDATE := yes
ALL += noderepo
noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
noderepo-RPMDATE := yes
ALL += noderepo
+IN_MYPLC += noderepo
#
# slicerepo
#
# slicerepo
@@
-481,9
+516,8
@@
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-SPEC := slicerepo.spec
-slicerepo-RPMBUILD := bash ./rpmbuild.sh
# package requires all embedded packages
slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
# package requires all embedded packages
slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
@@
-495,7
+529,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
@@
-503,12
+537,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