X-Git-Url: http://git.onelab.eu/?p=wextoolbox.git;a=blobdiff_plain;f=wextoolbox.mk;h=db0fdcdcbdc3ac8b5259d1baa2880b3141f3360d;hp=97d7a33cbd53f80632a64a7caa76d29b98dd6cb3;hb=7cd779f563a93865ef07a23c12ee15533dda87dc;hpb=7588d3ad3ab121b26d6ddf09bc7379127d409362

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 97d7a33..db0fdcd 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -5,47 +5,11 @@
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-### NOTES on diffs with onelab
-# 2.6.27 vs 2.6.22 - does not need iwlwifi exception anymore
-# does not include:
-# ipfw (might just work) - svn:ipfw
-# ipfwslice - svn:ipfw
-# nozomi (does not work on 2.6.27) svn:nozomi
-# comgt - svn:comgt
-# umts-backend - svn:planetlab-umts-tools
-# umts-frontend - svn:planetlab-umts-tools
-# dummynet_image - svn:dummynet_image
 
 #
 # see doc in Makefile  
 #
 
-########## this should not be needed with f14 anymore 
-#f14# #
-#f14# # boost
-#f14# # 
-#f14# # we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
-#f14# # this build is based on the f11 rpm, i.e. boost-1.37
-#f14# #
-#f14# boost-MODULES := boost
-#f14# boost-SPEC := boost.spec
-#f14# boost-BUILD-FROM-SRPM := yes
-#f14# boost-DEVEL-RPMS := bzip2-devel libicu-devel chrpath
-#f14# ALL += boost
-#f14# IN_BOOTSTRAPFS += boost
-#f14# 
-#f14# #
-#f14# # gnuradio
-#f14# #
-#f14# gnuradio-MODULES := gnuradio
-#f14# gnuradio-SPEC := gnuradio.spec
-#f14# gnuradio-BUILD-FROM-SRPM := yes
-#f14# gnuradio-DEVEL-RPMS := python-numeric numpy wxPython PyQt4 swig fftw sdcc gsl guile cppunit fftw-devel gsl-devel libusb-devel cppunit-devel
-#f14# # boost-devel needs boost !
-#f14# gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
-#f14# ALL += gnuradio
-#f14# IN_BOOTSTRAPFS += gnuradio
-
 #
 # bbn
 #
@@ -56,7 +20,7 @@ bbn-BUILD-FROM-SRPM := yes
 bbn-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel swig
 #bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
 ALL += bbn
-IN_BOOTSTRAPFS += bbn
+IN_NODEIMAGE += bbn
 
 #
 # crunchxml
@@ -66,7 +30,7 @@ crunchxml-SPEC := crunchxml.spec
 crunchxml-BUILD-FROM-SRPM := yes
 crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons
 ALL += crunchxml
-IN_BOOTSTRAPFS += crunchxml
+IN_NODEIMAGE += crunchxml
 
 #
 # spectools
@@ -76,7 +40,7 @@ spectools-SPEC := spectools.spec
 spectools-BUILD-FROM-SRPM := yes
 spectools-DEVEL-RPMS := gtk2-devel
 ALL += spectools
-IN_BOOTSTRAPFS += spectools
+IN_NODEIMAGE += spectools
 
 #
 # sge
@@ -88,153 +52,63 @@ sge-DEVEL-RPMS += kdevelop-devel kdevelop kdevelop-libs java-1.6.0-openjdk
 sge-DEVEL-RPMS += lesstif lesstif-devel
 
 # turning this off - current focus is on deploying the sge box separately from myplc
-# packaging is still broken, and we're exploring a ready-t-o-use distro on centos
+# packaging is still broken, and we're exploring a ready-to-use distro on centos
 # ALL += sge
-# IN_BOOTSTRAPFS += sge
+# IN_NODEIMAGE += sge
 
+########################################
 #
-# kernel
-#
-# use a package name with srpm in it:
-# so the source rpm is created by running make srpm in the codebase
+# lxctools: scripts for entering containers
 #
-
-kernel-MODULES := linux-2.6
-kernel-SPEC := kernel-2.6.spec
-kernel-BUILD-FROM-SRPM := yes
-ifeq "$(HOSTARCH)" "i386"
-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
-
-kernels: $(KERNELS)
-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)
+lxctools-MODULES := lxctools
+lxctools-SPEC := lxctools.spec
+ALL += lxctools
+IN_NODEIMAGE += lxctools
 
 #
-# madwifi
+# lxcsu: root context module for entering namespaces
 #
-madwifi-MODULES := madwifi
-madwifi-SPEC := madwifi.spec
-madwifi-BUILD-FROM-SRPM := yes
-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
+lxcsu-MODULES := lxcsu
+lxcsu-SPEC := lxcsu.spec
+ALL += lxcsu
+IN_NODEIMAGE += lxcsu
 
 #
-# iptables
 #
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
+# transforward: root context module for transparent port forwarding
+#
+transforward-MODULES := transforward
+transforward-SPEC := transforward.spec
+ALL += transforward
+IN_NODEIMAGE += transforward
 
 #
-# iproute
+# procprotect: root context module for protecting against weaknesses in /proc
 #
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
+procprotect-MODULES := procprotect
+procprotect-SPEC := procprotect.spec
+ALL += procprotect
+IN_NODEIMAGE += procprotect
 
 #
 # ipfw: root context module, and slice companion
 #
 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
+IN_NODEIMAGE += ipfwroot
 
 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
 
-#
-# umts: root context stuff
-#
-umts-backend-MODULES := planetlab-umts-tools
-umts-backend-SPEC := backend.spec
-IN_BOOTSTRAPFS += umts-backend
-ALL += umts-backend
-
-#
-# umts: slice tools
-#
-umts-frontend-MODULES := planetlab-umts-tools
-umts-frontend-SPEC := frontend.spec
-IN_VSERVER += umts-frontend
-ALL += umts-frontend
-
-#
-# util-vserver
-#
-util-vserver-MODULES := util-vserver
-util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
-ALL += util-vserver
-IN_BOOTSTRAPFS += 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
-#
-local_libnl=false
-ifeq "$(DISTRONAME)" "centos5"
-local_libnl=true
-endif
-
-ifeq "$(local_libnl)" "true"
-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
-ALL += libnl
-IN_BOOTSTRAPFS += libnl
-endif
-
-#
-# util-vserver-pl
-#
-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 
-ifeq "$(local_libnl)" "true"
-util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
-endif
-ALL += util-vserver-pl
-IN_BOOTSTRAPFS += util-vserver-pl
-
 #
 # NodeUpdate
 #
 nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
-IN_BOOTSTRAPFS += nodeupdate
+IN_NODEIMAGE += nodeupdate
 
 #
 # ipod
@@ -242,15 +116,28 @@ IN_BOOTSTRAPFS += nodeupdate
 ipod-MODULES := PingOfDeath
 ipod-SPEC := ipod.spec
 ALL += ipod
-IN_BOOTSTRAPFS += ipod
+IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-lxc.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
 #
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_BOOTSTRAPFS += nodemanager
+# nodemanager
+#
+nodemanager-lib-MODULES := nodemanager
+nodemanager-lib-SPEC := nodemanager-lib.spec
+ALL += nodemanager-lib
+IN_NODEIMAGE += nodemanager-lib
+
+nodemanager-lxc-MODULES := nodemanager
+nodemanager-lxc-SPEC := nodemanager-lxc.spec
+ALL += nodemanager-lxc
+IN_NODEIMAGE += nodemanager-lxc
 
 #
 # pl_sshd
@@ -258,7 +145,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
@@ -266,7 +153,7 @@ IN_BOOTSTRAPFS += sshd
 codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
 ALL += codemux
-IN_BOOTSTRAPFS += codemux
+IN_NODEIMAGE += codemux
 
 #
 # fprobe-ulog
@@ -274,7 +161,36 @@ 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
+
+#################### libvirt on f16 is too old, sounds like f17 has something fine
+local_libvirt=false
+ifeq "$(DISTRONAME)" "f16"
+local_libvirt=true
+endif
+
+ifeq "$(local_libvirt)" "true"
+#
+# libvirt
+#
+libvirt-MODULES := libvirt
+libvirt-SPEC    := libvirt.spec
+libvirt-BUILD-FROM-SRPM := yes
+libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext 
+libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel 
+libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas 
+libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub
+libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
+	                --without storage-fs --without storage-lvm \
+	                --without polkit --without sasl --without audit --with capng --with udev \
+	                --without netcf --without avahi --without sanlock \
+	                --without xen --without qemu --without hyperv --without phyp --without esx \
+	                --without libxl \
+	                --define 'packager PlanetLab'
+ALL += libvirt
+IN_NODEREPO += libvirt
+IN_NODEIMAGE += libvirt
+endif
 
 #
 # pf2slice
@@ -283,53 +199,49 @@ pf2slice-MODULES := pf2slice
 pf2slice-SPEC := pf2slice.spec
 ALL += pf2slice
 
-#
-# PlanetLab Mom: Cleans up your mess
-#
-mom-MODULES := Mom
-mom-SPEC := pl_mom.spec
-ALL += mom
-IN_BOOTSTRAPFS += mom
-
-#
-# inotify-tools - local import
-# rebuild this on centos5 (not found) - see kexcludes in build.common
-#
-local_inotify_tools=false
-ifeq "$(DISTRONAME)" "centos5"
-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
-ALL += inotify-tools
-endif
+##
+## PlanetLab Mom: Cleans up your mess
+##
+#mom-MODULES := mom
+#mom-SPEC := pl_mom.spec
+#ALL += mom
+#IN_NODEIMAGE += mom
 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
-vsys-DEVEL-RPMS += ocaml-docs ocaml-ocamldoc
-ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
-endif
-IN_BOOTSTRAPFS += vsys
+vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+IN_NODEIMAGE += vsys
 ALL += vsys
 
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLICEIMAGE += vsyssh
+ALL += vsyssh
+
 #
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
-IN_BOOTSTRAPFS += vsys-scripts
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
+IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
 #
-# PLCAPI
+# bind_public
+#
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
+
+#
+# plcapi
 #
 plcapi-MODULES := plcapi
 plcapi-SPEC := PLCAPI.spec
@@ -414,10 +326,33 @@ IN_BOOTCD += pypcilib
 pyplnet-MODULES := pyplnet
 pyplnet-SPEC := pyplnet.spec
 ALL += pyplnet
-IN_BOOTSTRAPFS += pyplnet
+IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
+#
+# OMF resource controller
+#
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_SLICEIMAGE += omf-resctl
+
+#
+# OMF exp controller
+#
+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
 #
@@ -430,40 +365,49 @@ ALL += bootcd
 IN_MYPLC += bootcd
 
 #
-# vserver : reference image for slices
+# images 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
+# lxc-specific sliceimage initialization
+# 
+lxc-sliceimage-MODULES	:= sliceimage
+lxc-sliceimage-SPEC	:= lxc-sliceimage.spec
+lxc-sliceimage-RPMDATE	:= yes
+ALL			+= lxc-sliceimage
+IN_NODEIMAGE		+= lxc-sliceimage
+
 #
-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
+#
+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_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 regular packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+# package requires all embedded packages
+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)
@@ -471,6 +415,25 @@ noderepo-RPMDATE := yes
 ALL += noderepo
 IN_MYPLC += noderepo
 
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+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 := nodeimage
+slicerepo-SPEC := slicerepo.spec
+# package requires all embedded packages
+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)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #