#sge-GITPATH := git://git.onelab.eu/sge/tags/sge-6.2.3-1
#sge-GITPATH := git://git.onelab.eu/sge/trunk
+lxcsu-GITPATH := git://git.onelab.eu/lxcsu.git@lxcsu-0.2-1
+lxctools-GITPATH := git://git.onelab.eu/lxctools.git@lxctools-0.9-1
+transforward-GITPATH := git://git.onelab.eu/transforward.git@transforward-0.1-2
+procprotect-GITPATH := git://git.onelab.eu/procprotect.git@procprotect-0.1-3
+ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-20120610-2
###
-linux-2.6-BRANCH := 32
-linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-33
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f16 centos5)"
-kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
-endif
-kernel-DEVEL-RPMS += elfutils-libelf-devel
-
-madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-5
-iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
-###
-ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-23
-###
-planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
-util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-20
-util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
-nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
+nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-35
+plnode-utils-GITPATH := git://git.onelab.eu/plnode-utils@plnode-utils-0.2-1
+nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.1-13
pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15
fprobe-ulog-GITPATH := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-2
+libvirt-GITPATH := git://git.onelab.eu/libvirt.git@libvirt-0.9.12-1
pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
-Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
-inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-2
-vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-2
-vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-39
-plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.1-1
+mom-GITPATH := git://git.onelab.eu/mom.git@mom-2.3-5
+inotify-tools-GITPATH := git://git.onelab.eu/inotify-tools.git@inotify-tools-3.13-2
+openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.2-1
+vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-2
+vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-44
+bind_public-GITPATH := git://git.onelab.eu/bind_public.git@bind_public-0.1-2
+plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.1-4
drupal-GITPATH := git://git.onelab.eu/drupal.git@drupal-4.7-15
-plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-72
-www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
-pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-12
+plewww-GITPATH := git://git.onelab.eu/plewww.git@master
+www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
+monitor-GITPATH := git://git.onelab.eu/monitor@monitor-3.1-6
+PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
pyopenssl-GITPATH := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
###
pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-2
oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1
###
nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-7
-bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-22
+bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.1-3
pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
-pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-14
+pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-15
bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.1-2
-sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-1
-nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-2.1-1
-myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.1-2
+sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-3
+nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-2.1-3
+myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.1-4
# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.1-4
+tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.1-7
# 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
# ALL += 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
#
+lxctools-MODULES := lxctools
+lxctools-SPEC := lxctools.spec
+ALL += lxctools
+IN_NODEIMAGE += lxctools
-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
+#
+# lxcsu: root context module for entering namespaces
+#
+lxcsu-MODULES := lxcsu
+lxcsu-SPEC := lxcsu.spec
+ALL += lxcsu
+IN_NODEIMAGE += lxcsu
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
+#
+#
+# transforward: root context module for transparent port forwarding
+#
+transforward-MODULES := transforward
+transforward-SPEC := transforward.spec
+ALL += transforward
+IN_NODEIMAGE += transforward
-ALL += $(KERNELS)
-# this is to mark on which image a given rpm is supposed to go
-IN_BOOTCD += $(KERNELS)
-IN_SLICEIMAGE += $(KERNELS)
-IN_NODEIMAGE += $(KERNELS)
+#
+# procprotect: root context module for protecting against weaknesses in /proc
+#
+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
-#
-# madwifi
-#
-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_NODEIMAGE += madwifi
-
-#
-# umts: root context stuff
-#
-umts-backend-MODULES := planetlab-umts-tools
-umts-backend-SPEC := backend.spec
-IN_NODEIMAGE += umts-backend
-ALL += umts-backend
-
-#
-# umts: slice tools
-#
-umts-frontend-MODULES := planetlab-umts-tools
-umts-frontend-SPEC := frontend.spec
-IN_SLICEIMAGE += umts-frontend
-ALL += umts-frontend
-
-#
-# iptables
-#
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-BUILD-FROM-SRPM := yes
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
-ALL += iptables
-IN_NODEIMAGE += iptables
-
-#
-# util-vserver
-#
-util-vserver-MODULES := util-vserver
-util-vserver-SPEC := util-vserver.spec
-util-vserver-BUILD-FROM-SRPM := yes
-util-vserver-RPMFLAGS:= --without dietlibc --without doc
-ALL += util-vserver
-IN_NODEIMAGE += util-vserver
-
-#
-# 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
-ALL += util-vserver-pl
-IN_NODEIMAGE += util-vserver-pl
-
#
# NodeUpdate
#
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
#
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += 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
ALL += 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
#
pf2slice-SPEC := pf2slice.spec
ALL += pf2slice
-#
-# PlanetLab Mom: Cleans up your mess
-#
-mom-MODULES := Mom
-mom-SPEC := pl_mom.spec
-ALL += mom
-IN_NODEIMAGE += mom
+##
+## PlanetLab Mom: Cleans up your mess
+##
+#mom-MODULES := mom
+#mom-SPEC := pl_mom.spec
+#ALL += mom
+#IN_NODEIMAGE += mom
#
# vsys
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
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
+#
+# bind_public
+#
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
+
#
# plcapi
#
IN_NODEIMAGE += sliceimage
#
-# vserver-specific sliceimage initialization
+# lxc-specific sliceimage initialization
#
-vserver-sliceimage-MODULES := sliceimage
-vserver-sliceimage-SPEC := vserver-sliceimage.spec
-vserver-sliceimage-RPMDATE := yes
-ALL += vserver-sliceimage
-IN_NODEIMAGE += vserver-sliceimage
+lxc-sliceimage-MODULES := sliceimage
+lxc-sliceimage-SPEC := lxc-sliceimage.spec
+lxc-sliceimage-RPMDATE := yes
+ALL += lxc-sliceimage
+IN_NODEIMAGE += lxc-sliceimage
#
# nodeimage