# see doc in Makefile
#
+### the madwifi drivers ahip with fedora16's kernel rpm
+
+#
+# lxctools: scripts for entering containers
#
-# kernel
+lxctools-MODULES := lxctools
+lxctools-SPEC := lxctools.spec
+ALL += lxctools
+IN_NODEIMAGE += lxctools
+
#
-# use a package name with srpm in it:
-# so the source rpm is created by running make srpm in the codebase
+# lxcsu: root context module for entering namespaces
#
+lxcsu-MODULES := lxcsu
+lxcsu-SPEC := lxcsu.spec
+ALL += lxcsu
+IN_NODEIMAGE += lxcsu
-# rebuild kernel-3.1 on fedora14 due to instabilities of the stock kernel
-ifeq "$(DISTRONAME)" "f14"
-kernel-MODULES := linux-3
-kernel-SPEC := kernel-3.1.spec
-kernel-DEVEL-RPMS += gettext elfutils-devel
-kernel-BUILD-FROM-SRPM := yes
-ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686 --with firmware
-else
-kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
-endif
-kernel-SPECVARS += kernelconfig=planetlab
-KERNELS += kernel
+#
+#
+# transforward: root context module for transparent port forwarding
+#
+transforward-MODULES := transforward
+transforward-SPEC := transforward.spec
+ALL += transforward
+IN_NODEIMAGE += transforward
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
+#
+# procprotect: root context module for protecting against weaknesses in /proc
+#
+procprotect-MODULES := procprotect
+procprotect-SPEC := procprotect.spec
+ALL += procprotect
+IN_NODEIMAGE += procprotect
-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)
-endif
+#
+# ipfw: root context module, and slice companion
+#
+ipfwroot-MODULES := ipfw
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+ALL += ipfwroot
+IN_NODEIMAGE += ipfwroot
+
+ipfwslice-MODULES := ipfw
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ALL += ipfwslice
#
# 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
+#################### using our own libvirt on all distros for now
+#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
-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'
+# The --without options are breaking spec2make : hard-wired in the specfile instead
+libvirt-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel
+libvirt-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
+libvirt-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
+libvirt-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
+ifeq "$(DISTRONAME)" "f16"
+libvirt-DEVEL-RPMS += libnl-devel libudev-devel
+endif
+ifeq "$(DISTRONAME)" "f18"
+libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
+libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6
+endif
+libvirt-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
+endif
#
# DistributedRateLimiting
##
## PlanetLab Mom: Cleans up your mess
##
-#mom-MODULES := Mom
+#mom-MODULES := mom
#mom-SPEC := pl_mom.spec
#ALL += mom
#IN_NODEIMAGE += mom
#
# openvswitch
#
-openvswitch-MODULES := openvswitch
-openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-IN_NODEIMAGE += openvswitch
-# build only on f14 as f16 has this natively
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
-ALL += openvswitch
-endif
+# openvswitch-MODULES := openvswitch
+# openvswitch-SPEC := openvswitch.spec
+# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# IN_NODEIMAGE += openvswitch
+# # build only on f14 as f16 has this natively
+# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
+# ALL += openvswitch
+# endif
#
# vsys
# 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
#
plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
ALL += plcapi
IN_MYPLC += plcapi
IN_NODEIMAGE += sliceimage
#
-# LXC reference images
-#
-lxcref-MODULES := lxc-reference
-lxcref-SPEC := lxc-reference.spec
-ALL += lxcref
-IN_NODEIMAGE += lxcref
+# 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
#
# nodeimage