X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=200a707db7e6c2c2809317de5dbd559f5f972c24;hb=a634ea79f2ab806070fe93ad9bf92fdbd2a8220c;hp=d49583a7cac4673d004c1ace2d345cc0f12d2ddb;hpb=cb4e742fecd0473d2ccd2b88d8e911875e1e1b81;p=build.git diff --git a/lxc.mk b/lxc.mk index d49583a7..200a707d 100644 --- a/lxc.mk +++ b/lxc.mk @@ -8,36 +8,47 @@ # 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 -kernels: $(KERNELS) -kernels-clean: $(foreach package,$(KERNELS),$(package)-clean) +# +# ipfw: root context module, and slice companion +# +# starting on 2013-03-05 when f18 has moved to kernel 3.8 this module won't build anymore +#ifeq "$(DISTRONAME)" "f16" +ipfwroot-MODULES := ipfw +ipfwroot-SPEC := planetlab/ipfwroot.spec +ALL += ipfwroot +IN_NODEIMAGE += ipfwroot -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 +ipfwslice-MODULES := ipfw +ipfwslice-SPEC := planetlab/ipfwslice.spec +ALL += ipfwslice +#endif # # NodeUpdate @@ -56,12 +67,25 @@ 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-MODULES := nodemanager -nodemanager-SPEC := NodeManager.spec -ALL += nodemanager -IN_NODEIMAGE += 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 @@ -87,26 +111,37 @@ fprobe-ulog-SPEC := fprobe-ulog.spec 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 +# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future +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 @@ -126,7 +161,7 @@ ALL += pf2slice ## ## PlanetLab Mom: Cleans up your mess ## -#mom-MODULES := Mom +#mom-MODULES := mom #mom-SPEC := pl_mom.spec #ALL += mom #IN_NODEIMAGE += mom @@ -155,11 +190,14 @@ 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-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 @@ -186,18 +224,51 @@ 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 + +# +# 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 +# +# mod_python +# +# this was dropped in fedora18, at which point the intention has been to +# move to wsgi instead; however our using wsgi currently looks unstable +# so you have the option to install this manually, in which case myplc will +# swap to using mod_python - see plc.d/httpd +ifeq "$(DISTRO)" "Fedora" +ifneq "$(DISTRONAME)" "f16" +mod_python-MODULES := mod_python +mod_python-SPEC := mod_python.spec +mod_python-DEVEL-RPMS := httpd-devel +mod_python-BUILD-FROM-SRPM := yes +ALL += mod_python +endif +endif + # # drupal # @@ -265,26 +336,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 +371,20 @@ IN_MYPLC += pyplnet IN_BOOTCD += pyplnet # -# OMF resource controller +# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff # -omf-resctl-MODULES := omf -omf-resctl-SPEC := omf-resctl.spec -ALL += omf-resctl -IN_SLICEIMAGE += omf-resctl +rvm-ruby-MODULES := rvm-ruby +rvm-ruby-SPEC := rpm/rvm-ruby.spec +rvm-ruby-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel +ALL += rvm-ruby # -# OMF exp controller +# OML measurement library # -omf-expctl-MODULES := omf -omf-expctl-SPEC := omf-expctl.spec -ALL += omf-expctl +oml-MODULES := oml +oml-DEVEL-RPMS += sqlite-devel +oml-SPEC := liboml.spec +ALL += oml # # bootcd @@ -357,12 +409,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 +487,33 @@ release-MODULES := myplc release-SPEC := myplc-release.spec release-RPMDATE := yes ALL += release + +############################## +# sfa requires python-2.7 +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 + +############################## +# don't build these by default, we have separate builds for that +myslice-MODULES := myslice +myslice-SPEC := myslice.spec +#ALL += myslice + +manifold-MODULES := manifold +manifold-SPEC := manifold.spec +#ALL += manifold