X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=ce7c30dd318e2ee8d0ab5c13f70a5c611cc398db;hb=495e884c5bc9b727a83c375c7e7841724707a9c9;hp=24b7261b817729608f63b6c0bcb50837df38d9b1;hpb=3025dd0fa53d37d975c6b6a9babf0366d37e99d5;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 24b7261b..ce7c30dd 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -23,8 +23,6 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-# 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
 
@@ -34,20 +32,20 @@ kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 ALL += $(KERNELS)
 # this is to mark on which image a given rpm is supposed to go
 IN_BOOTCD += $(KERNELS)
-IN_VSERVER += $(KERNELS)
-IN_BOOTSTRAPFS += $(KERNELS)
+IN_SLICEIMAGE += $(KERNELS)
+IN_NODEIMAGE += $(KERNELS)
 
 #
 # ipfw: root context module, and slice companion
 #
 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)
 ALL += ipfwroot
-IN_BOOTSTRAPFS += ipfwroot
+IN_NODEIMAGE += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
@@ -59,34 +57,27 @@ ALL += ipfwslice
 #
 # madwifi
 #
+# skip this with k32/f8
+ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
+ifneq "$(DISTRONAME)" "f8"
 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
-
-# 
-# nozomi
-# 
-nozomi-MODULES := nozomi
-nozomi-SPEC := nozomi.spec
-nozomi-DEPEND-DEVEL-RPMS := kernel-devel
-nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-	kernel_release=$(kernel.rpm-release) \
-	kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += nozomi
-ALL += nozomi
+IN_NODEIMAGE += madwifi
+endif
+endif
 
 #
 # comgt
 # 
 comgt-MODULES := comgt
 comgt-SPEC := comgt.spec
-IN_BOOTSTRAPFS += comgt
+IN_NODEIMAGE += comgt
 ALL += comgt
 
 #
@@ -94,7 +85,7 @@ ALL += comgt
 #
 umts-backend-MODULES := planetlab-umts-tools
 umts-backend-SPEC := backend.spec
-IN_BOOTSTRAPFS += umts-backend
+IN_NODEIMAGE += umts-backend
 ALL += umts-backend
 
 #
@@ -102,7 +93,7 @@ ALL += umts-backend
 #
 umts-frontend-MODULES := planetlab-umts-tools
 umts-frontend-SPEC := frontend.spec
-IN_VSERVER += umts-frontend
+IN_SLICEIMAGE += umts-frontend
 ALL += umts-frontend
 
 #
@@ -110,36 +101,40 @@ ALL += umts-frontend
 #
 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-BUILD-FROM-SRPM := yes	
+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
+IN_NODEIMAGE += iptables
+
+###
+# we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel
+# note that this should be consistently reflected in nodeyumexclude
+# #
+# # iproute
+# #
+# iproute-MODULES := iproute2
+# iproute-SPEC := iproute.spec
+# iproute-BUILD-FROM-SRPM := yes	
+# ALL += iproute
+# IN_NODEIMAGE += iproute
+# IN_SLICEIMAGE += iproute
+# IN_BOOTCD += iproute
 
 #
 # util-vserver
 #
 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
+IN_NODEIMAGE += util-vserver
 
 #
 # libnl - local import
 # we need either 1.1 or at least 1.0.pre6
-# rebuild this on centos5 - see kexcludes in build.common
+# rebuild this on centos5 - see yumexclude
 #
 local_libnl=false
 ifeq "$(DISTRONAME)" "centos5"
@@ -151,9 +146,9 @@ 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
+libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
-IN_BOOTSTRAPFS += libnl
+IN_NODEIMAGE += libnl
 endif
 
 #
@@ -161,12 +156,12 @@ endif
 #
 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
 ALL += util-vserver-pl
-IN_BOOTSTRAPFS += util-vserver-pl
+IN_NODEIMAGE += util-vserver-pl
 
 #
 # NodeUpdate
@@ -174,7 +169,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
-IN_BOOTSTRAPFS += nodeupdate
+IN_NODEIMAGE += nodeupdate
 
 #
 # ipod
@@ -182,7 +177,7 @@ IN_BOOTSTRAPFS += nodeupdate
 ipod-MODULES := PingOfDeath
 ipod-SPEC := ipod.spec
 ALL += ipod
-IN_BOOTSTRAPFS += ipod
+IN_NODEIMAGE += ipod
 
 #
 # NodeManager
@@ -190,7 +185,7 @@ IN_BOOTSTRAPFS += ipod
 nodemanager-MODULES := nodemanager
 nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
-IN_BOOTSTRAPFS += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd
@@ -198,7 +193,7 @@ IN_BOOTSTRAPFS += nodemanager
 sshd-MODULES := pl_sshd
 sshd-SPEC := pl_sshd.spec
 ALL += sshd
-IN_BOOTSTRAPFS += sshd
+IN_NODEIMAGE += sshd
 
 #
 # codemux: Port 80 demux
@@ -206,7 +201,7 @@ IN_BOOTSTRAPFS += sshd
 codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
 ALL += codemux
-IN_BOOTSTRAPFS += codemux
+IN_NODEIMAGE += codemux
 
 #
 # fprobe-ulog
@@ -214,16 +209,18 @@ IN_BOOTSTRAPFS += codemux
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
-IN_BOOTSTRAPFS += fprobe-ulog
+IN_NODEIMAGE += fprobe-ulog
 
 #
 # DistributedRateLimiting
 #
+# on f16 somehow configure screws up and defines LDFLAGS=-Wl,-z,relro which ld does not like..
+ifneq "$(DISTRONAME)" "f16"
 DistributedRateLimiting-MODULES := DistributedRateLimiting
 DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
 ALL += DistributedRateLimiting
 IN_NODEREPO += DistributedRateLimiting
-
+endif
 
 #
 # pf2slice
@@ -238,22 +235,26 @@ ALL += pf2slice
 mom-MODULES := Mom
 mom-SPEC := pl_mom.spec
 ALL += mom
-IN_BOOTSTRAPFS += mom
+IN_NODEIMAGE += mom
 
 #
 # inotify-tools - local import
-# rebuild this on centos5 (not found) - see kexcludes in build.common
+# rebuild this on centos5 (not found) - see yumexclude
 #
 local_inotify_tools=false
 ifeq "$(DISTRONAME)" "centos5"
 local_inotify_tools=true
 endif
 
+ifeq "$(DISTRONAME)" "sl6"
+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
+IN_NODEIMAGE += inotify-tools
 ALL += inotify-tools
 endif
 
@@ -262,8 +263,9 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS := kernel-devel
-IN_BOOTSTRAPFS += openvswitch
+openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# maybe not in production yet
+#IN_NODEIMAGE += openvswitch
 ALL += openvswitch
 
 #
@@ -271,18 +273,28 @@ ALL += openvswitch
 #
 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"
-vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
+vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
-IN_BOOTSTRAPFS += vsys
+IN_NODEIMAGE += vsys
 ALL += vsys
 
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLIVER += vsyssh
+ALL += vsyssh
+
 #
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
 vsys-scripts-SPEC := vsys-scripts.spec
-IN_BOOTSTRAPFS += vsys-scripts
+IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
 #
@@ -328,18 +340,11 @@ ALL += pcucontrol
 #
 # monitor
 #
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
+monitor-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
-IN_BOOTSTRAPFS += monitor
-
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-ALL += zabbix
+IN_NODEIMAGE += monitor
 
 #
 # PLC RT
@@ -348,6 +353,8 @@ plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
 ALL += plcrt
 
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 #
 # pyopenssl
 #
@@ -355,6 +362,7 @@ pyopenssl-MODULES := pyopenssl
 pyopenssl-SPEC := pyOpenSSL.spec
 pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
+endif
 
 #
 # pyaspects
@@ -370,6 +378,7 @@ ALL += pyaspects
 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)"
@@ -377,8 +386,9 @@ ALL += ejabberd
 endif
 
 # sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
+# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model
 build_sfa=true
-ifeq "$(DISTRONAME)" "centos5"
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
 build_sfa=false
 endif
 
@@ -389,11 +399,11 @@ ifeq "$(build_sfa)" "true"
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
-endif
 
 sface-MODULES := sface
 sface-SPEC := sface.spec
 ALL += sface
+endif
 
 #
 # nodeconfig
@@ -425,7 +435,7 @@ IN_BOOTCD += pypcilib
 pyplnet-MODULES := pyplnet
 pyplnet-SPEC := pyplnet.spec
 ALL += pyplnet
-IN_BOOTSTRAPFS += pyplnet
+IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
@@ -435,7 +445,7 @@ IN_BOOTCD += pyplnet
 omf-resctl-MODULES := omf
 omf-resctl-SPEC := omf-resctl.spec
 ALL += omf-resctl
-IN_VSERVER += omf-resctl
+IN_SLICEIMAGE += omf-resctl
 
 #
 # OMF exp controller
@@ -444,6 +454,14 @@ omf-expctl-MODULES := omf
 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
 #
@@ -458,38 +476,38 @@ IN_MYPLC += bootcd
 #
 # vserver : reference image for slices
 #
-vserver-MODULES := vserver-reference build
-vserver-SPEC := vserver-reference.spec
-vserver-DEPEND-PACKAGES := $(IN_VSERVER)
-vserver-DEPEND-FILES := RPMS/yumgroups.xml
-vserver-RPMDATE := yes
-ALL += vserver
-IN_BOOTSTRAPFS += vserver
+sliceimage-MODULES := sliceimage build
+sliceimage-SPEC := sliceimage.spec
+sliceimage-DEPEND-PACKAGES := $(IN_SLICEIMAGE)
+sliceimage-DEPEND-FILES := RPMS/yumgroups.xml
+sliceimage-RPMDATE := yes
+ALL += sliceimage
+IN_NODEIMAGE += sliceimage
 
 #
-# bootstrapfs
+# nodeimage
 #
-bootstrapfs-MODULES := bootstrapfs build
-bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
-bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
-bootstrapfs-RPMDATE := yes
-ALL += bootstrapfs
-IN_MYPLC += bootstrapfs
+nodeimage-MODULES := nodeimage build
+nodeimage-SPEC := nodeimage.spec
+nodeimage-DEPEND-PACKAGES := $(IN_NODEIMAGE)
+nodeimage-DEPEND-FILES := RPMS/yumgroups.xml
+nodeimage-RPMDATE := yes
+ALL += nodeimage
+IN_MYPLC += nodeimage
 
 #
 # noderepo
 #
-# all rpms resulting from packages marked as being in bootstrapfs and vserver
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms))
+# all rpms resulting from packages marked as being in nodeimage and sliceimage
+NODEREPO_RPMS = $(foreach package,$(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE),$($(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 := nodeimage
 noderepo-SPEC := noderepo.spec
 # package requires all embedded packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
+noderepo-DEPEND-PACKAGES := $(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 #export rpm list to the specfile
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
@@ -501,15 +519,15 @@ IN_MYPLC += noderepo
 # slicerepo
 #
 # all rpms resulting from packages marked as being in vserver
-SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
+SLICEREPO_RPMS = $(foreach package,$(IN_SLICEIMAGE),$($(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-MODULES := nodeimage
 slicerepo-SPEC := slicerepo.spec
 # package requires all embedded packages
-slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
+slicerepo-DEPEND-PACKAGES := $(IN_SLICEIMAGE)
 slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
 #export rpm list to the specfile
 slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
@@ -527,7 +545,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-MODULES := myplc plcapi nodemanager Monitor
+myplc-docs-MODULES := myplc plcapi nodemanager monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs