X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=67d607df5125b1a3099d9038e9034879b71c99c3;hb=1b6bffb77c1c5f3558e5f99683c810f821b4e330;hp=d49583a7cac4673d004c1ace2d345cc0f12d2ddb;hpb=cb4e742fecd0473d2ccd2b88d8e911875e1e1b81;p=build.git diff --git a/lxc.mk b/lxc.mk index d49583a7..67d607df 100644 --- a/lxc.mk +++ b/lxc.mk @@ -8,36 +8,68 @@ # see doc in Makefile # +### the madwifi drivers ship with fedora16's kernel rpm + +# +# lxc-userspace: scripts for entering containers # -# kernel +lxc-userspace-MODULES := lxc-userspace +lxc-userspace-SPEC := lxc-userspace.spec +ALL += lxc-userspace +IN_NODEIMAGE += lxc-userspace + # -# use a package name with srpm in it: -# so the source rpm is created by running make srpm in the codebase # +# transforward: root context module for transparent port forwarding +# +transforward-MODULES := transforward +transforward-SPEC := transforward.spec +ALL += transforward +IN_NODEIMAGE += transforward -# 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 +# +# 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 +ALL += ipfwroot +IN_NODEIMAGE += ipfwroot -kernels: $(KERNELS) -kernels-clean: $(foreach package,$(KERNELS),$(package)-clean) +ipfwslice-MODULES := ipfw +ipfwslice-SPEC := planetlab/ipfwslice.spec +ALL += ipfwslice -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 +# +# comgt - a companion to umts tools +# +comgt-MODULES := comgt +comgt-SPEC := comgt.spec +IN_NODEIMAGE += comgt +ALL += comgt + +# +# 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 # # NodeUpdate @@ -56,10 +88,18 @@ ALL += 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 # nodemanager-MODULES := nodemanager -nodemanager-SPEC := NodeManager.spec +nodemanager-SPEC := nodemanager.spec ALL += nodemanager IN_NODEIMAGE += nodemanager @@ -87,27 +127,54 @@ fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_NODEIMAGE += fprobe-ulog +#################### libvirt version selection +# settling with using version 1.2.1 on all fedoras +# although this does not solve the slice re-creation issue seen on f20 + +local_libvirt=true +separate_libvirt_python=true + # # libvirt # +ifeq "$(local_libvirt)" "true" + 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-STOCK-DEVEL-RPMS += xhtml1-dtds +libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel +libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel +libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub +# for 1.2.1 - first seen on f20, not sure for the other ones +libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel +# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future +libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad +libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel ALL += libvirt IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt +endif + +# +## libvirt-python +# +ifeq "$(separate_libvirt_python)" "true" + +libvirt-python-MODULES := libvirt-python +libvirt-python-SPEC := libvirt-python.spec +libvirt-python-BUILD-FROM-SRPM := yes +libvirt-python-STOCK-DEVEL-RPMS += pm-utils +libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client +libvirt-python-RPMFLAGS := --define 'packager PlanetLab' +ALL += libvirt-python +IN_NODEREPO += libvirt-python +IN_NODEIMAGE += libvirt-python + +endif + # # DistributedRateLimiting # @@ -126,40 +193,22 @@ ALL += pf2slice ## ## PlanetLab Mom: Cleans up your mess ## -#mom-MODULES := Mom +#mom-MODULES := mom #mom-SPEC := pl_mom.spec #ALL += mom #IN_NODEIMAGE += mom -# -# inotify-tools - local import -# 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_NODEIMAGE += inotify-tools -ALL += inotify-tools -endif - # # openvswitch # -openvswitch-MODULES := openvswitch -openvswitch-SPEC := openvswitch.spec -openvswitch-DEPEND-DEVEL-RPMS += kernel-devel -IN_NODEIMAGE += openvswitch -ALL += openvswitch +# openvswitch-MODULES := openvswitch +# openvswitch-SPEC := openvswitch.spec +# openvswitch-STOCK-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 @@ -167,10 +216,7 @@ 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 -endif +vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs IN_NODEIMAGE += vsys ALL += vsys @@ -186,15 +232,36 @@ 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 +vsys-wrapper-MODULES := vsys-scripts +vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec +IN_SLICEIMAGE += vsys-wrapper +ALL += vsys-wrapper + +# +# bind_public +# +bind_public-MODULES := bind_public +bind_public-SPEC := bind_public.spec +IN_SLICEIMAGE += bind_public +ALL += bind_public + +# +# sliver-openvswitch +# +sliver-openvswitch-MODULES := sliver-openvswitch +sliver-openvswitch-SPEC := sliver-openvswitch.spec +IN_SLICEIMAGE += sliver-openvswitch +ALL += sliver-openvswitch + # # plcapi # plcapi-MODULES := plcapi -plcapi-SPEC := PLCAPI.spec +plcapi-SPEC := plcapi.spec ALL += plcapi IN_MYPLC += plcapi @@ -235,7 +302,7 @@ ALL += pcucontrol # #monitor-MODULES := monitor #monitor-SPEC := Monitor.spec -#monitor-DEVEL-RPMS += net-snmp net-snmp-devel +#monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel #ALL += monitor #IN_NODEIMAGE += monitor @@ -265,26 +332,6 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects -# 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)" "$(filter $(DISTRONAME),f8 f12 centos5)" -build_sfa=false -endif - -ifeq "$(build_sfa)" "true" -# -# sfa - Slice Facility Architecture -# -sfa-MODULES := sfa -sfa-SPEC := sfa.spec -ALL += sfa - -sface-MODULES := sface -sface-SPEC := sface.spec -ALL += sface -endif - # # nodeconfig # @@ -320,19 +367,12 @@ 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 +# OML measurement library # -omf-expctl-MODULES := omf -omf-expctl-SPEC := omf-expctl.spec -ALL += omf-expctl +oml-MODULES := oml +oml-STOCK-DEVEL-RPMS += sqlite-devel +oml-SPEC := liboml.spec +ALL += oml # # bootcd @@ -357,12 +397,13 @@ ALL += sliceimage 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 @@ -434,3 +475,11 @@ release-MODULES := myplc release-SPEC := myplc-release.spec release-RPMDATE := yes ALL += release + +############################## +# +# sfa - Slice Facility Architecture +# +sfa-MODULES := sfa +sfa-SPEC := sfa.spec +ALL += sfa