X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=17901b18cb3f4640f7bae24033350b9488985d13;hb=c1e2ea74e8245beb380ac64a12d8aa50ae9b8b19;hp=6bb9ba30adc59667530bb7f65d02866d4fd5e1e9;hpb=e1e312e79829c870fc9f79f832170f848a508494;p=build.git diff --git a/lxc.mk b/lxc.mk index 6bb9ba30..17901b18 100644 --- a/lxc.mk +++ b/lxc.mk @@ -8,23 +8,15 @@ # see doc in Makefile # -### the madwifi drivers ahip with fedora16's kernel rpm +### the madwifi drivers ship with fedora16's kernel rpm # -# lxctools: scripts for entering containers +# lxc-userspace: scripts for entering containers # -lxctools-MODULES := lxctools -lxctools-SPEC := lxctools.spec -ALL += lxctools -IN_NODEIMAGE += lxctools - -# -# lxcsu: root context module for entering namespaces -# -lxcsu-MODULES := lxcsu -lxcsu-SPEC := lxcsu.spec -ALL += lxcsu -IN_NODEIMAGE += lxcsu +lxc-userspace-MODULES := lxc-userspace +lxc-userspace-SPEC := lxc-userspace.spec +ALL += lxc-userspace +IN_NODEIMAGE += lxc-userspace # # @@ -46,6 +38,8 @@ IN_NODEIMAGE += procprotect # # 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 @@ -54,6 +48,31 @@ IN_NODEIMAGE += ipfwroot ipfwslice-MODULES := ipfw ipfwslice-SPEC := planetlab/ipfwslice.spec ALL += ipfwslice +#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 @@ -116,11 +135,11 @@ fprobe-ulog-SPEC := fprobe-ulog.spec 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" +#################### using our own libvirt on all distros for now +#local_libvirt=false +#ifeq "$(DISTRONAME)" "f16" local_libvirt=true -endif +#endif ifeq "$(local_libvirt)" "true" # @@ -129,17 +148,19 @@ 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 libpcap-devel libnl-devel ebtables scrub ceph-devel -# The --without options are breaking spec2make -#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 \ +# 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 @@ -239,14 +260,39 @@ 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 # @@ -314,26 +360,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 # @@ -369,19 +395,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 @@ -484,3 +511,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