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
testing bootmanager master
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
88562d5
..
f8697d6
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-42,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)
@@
-56,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)
@@
-114,10
+110,8
@@
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
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
@@
-126,6
+120,7
@@
IN_BOOTSTRAPFS += iptables
#
iproute-MODULES := iproute2
iproute-SPEC := iproute.spec
#
iproute-MODULES := iproute2
iproute-SPEC := iproute.spec
+iproute-BUILD-FROM-SRPM := yes
ALL += iproute
IN_BOOTSTRAPFS += iproute
IN_VSERVER += iproute
ALL += iproute
IN_BOOTSTRAPFS += iproute
IN_VSERVER += iproute
@@
-136,7
+131,9
@@
IN_BOOTCD += iproute
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
+# starting with 0.4
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
ALL += util-vserver
IN_BOOTSTRAPFS += util-vserver
ALL += util-vserver
IN_BOOTSTRAPFS += util-vserver
@@
-155,7
+152,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
@@
-165,7
+162,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
@@
-209,7
+206,6
@@
IN_BOOTSTRAPFS += sshd
#
codemux-MODULES := codemux
codemux-SPEC := codemux.spec
#
codemux-MODULES := codemux
codemux-SPEC := codemux.spec
-#codemux-RPMBUILD := bash ./rpmbuild.sh
ALL += codemux
IN_BOOTSTRAPFS += codemux
ALL += codemux
IN_BOOTSTRAPFS += codemux
@@
-262,13
+258,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
@@
-324,8
+331,9
@@
ALL += pcucontrol
#
# monitor
#
#
# monitor
#
-monitor-MODULES :=
M
onitor
+monitor-MODULES :=
m
onitor
monitor-SPEC := Monitor.spec
monitor-SPEC := Monitor.spec
+monitor-DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
IN_BOOTSTRAPFS += monitor
ALL += monitor
IN_BOOTSTRAPFS += monitor
@@
-335,7
+343,9
@@
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
-ALL += zabbix
+zabbix-DEVEL-RPMS += python-cherrypy
+### turn this off as zabbix comes with stock fedora or epel
+###ALL += zabbix
#
# PLC RT
#
# PLC RT
@@
-366,7
+376,12
@@
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
# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
build_sfa=true
@@
-383,6
+398,10
@@
sfa-SPEC := sfa.spec
ALL += sfa
endif
ALL += sfa
endif
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+
#
# nodeconfig
#
#
# nodeconfig
#
@@
-432,12
+451,19
@@
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
+oml-SPEC := liboml.spec
+ALL += oml
+
#
# bootcd
#
bootcd-MODULES := bootcd build
bootcd-SPEC := bootcd.spec
#
# bootcd
#
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
bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
bootcd-DEPEND-FILES := RPMS/yumgroups.xml
bootcd-RPMDATE := yes
@@
-460,7
+486,6
@@
IN_BOOTSTRAPFS += vserver
#
bootstrapfs-MODULES := bootstrapfs build
bootstrapfs-SPEC := bootstrapfs.spec
#
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
bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
bootstrapfs-RPMDATE := yes
@@
-478,7
+503,6
@@
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
noderepo-MODULES := bootstrapfs
noderepo-SPEC := noderepo.spec
noderepo-MODULES := bootstrapfs
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
@@
-499,7
+523,6
@@
SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
slicerepo-MODULES := bootstrapfs
slicerepo-SPEC := slicerepo.spec
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
# package requires all embedded packages
slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
@@
-513,7
+536,6
@@
ALL += slicerepo
#
myplc-MODULES := myplc
myplc-SPEC := myplc.spec
#
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
ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but