X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=07aa552fb197bf8f4d5d2c1a69b8db39420ab3c3;hb=f32374281fa212ac418b4679551f3d33a0007ba3;hp=7fe4ad481dc373355ba0f11ed09c5af83f478c8d;hpb=ba16b89d675282517dc4dec75a71a9b2c98a1f7a;p=build.git diff --git a/lxc.mk b/lxc.mk index 7fe4ad48..07aa552f 100644 --- a/lxc.mk +++ b/lxc.mk @@ -30,25 +30,29 @@ IN_NODEIMAGE += transforward # # procprotect: root context module for protecting against weaknesses in /proc # +### remove procprotect from the nodes on f20 and above, needs more work starting with 3.19 +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25 f27 f29)" procprotect-MODULES := procprotect procprotect-SPEC := procprotect.spec ALL += procprotect IN_NODEIMAGE += procprotect +endif # # 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" +### starting August 2015, ipfw module won't build against fedora22 +# that comes with kernel 4.1.4 +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21 f22 f23 f24 f25 f27 f29)" ipfwroot-MODULES := ipfw ipfwroot-SPEC := planetlab/ipfwroot.spec ALL += ipfwroot IN_NODEIMAGE += ipfwroot +endif ipfwslice-MODULES := ipfw ipfwslice-SPEC := planetlab/ipfwslice.spec ALL += ipfwslice -#endif # # comgt - a companion to umts tools @@ -101,15 +105,10 @@ IN_NODEIMAGE += plnode-utils # # 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 +nodemanager-MODULES := nodemanager +nodemanager-SPEC := nodemanager.spec +ALL += nodemanager +IN_NODEIMAGE += nodemanager # # pl_sshd @@ -130,42 +129,70 @@ IN_NODEIMAGE += codemux # # fprobe-ulog # +# xxx temporarily turning this off on f20 and above +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21 f22 f23 f24 f25 f27 f29)" fprobe-ulog-MODULES := fprobe-ulog fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_NODEIMAGE += fprobe-ulog +endif -#################### using our own libvirt on all distros for now -#local_libvirt=false -#ifeq "$(DISTRONAME)" "f16" +#################### libvirt version selection + +# use fedora's libvirt starting with f22 +ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20 f21)" local_libvirt=true -#endif +endif -ifeq "$(local_libvirt)" "true" # # libvirt # +ifeq "$(local_libvirt)" "true" + libvirt-MODULES := libvirt libvirt-SPEC := libvirt.spec libvirt-BUILD-FROM-SRPM := yes # The --without options are breaking spec2make : hard-wired in the specfile instead -libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel +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 -ifeq "$(DISTRONAME)" "f16" -libvirt-STOCK-DEVEL-RPMS += libnl-devel libudev-devel -endif +# 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 -ifeq "$(DISTRONAME)" "f18" libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad -libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 -endif -libvirt-RPMFLAGS := --define 'packager PlanetLab' +libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel +# 1.2.11 +libvirt-STOCK-DEVEL-RPMS += wireshark-devel +libvirt-STOCK-DEVEL-RPMS += ceph-devel-compat ALL += libvirt IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt -endif + +# +## libvirt-python +# +libvirt-python-MODULES := libvirt-python +libvirt-python-SPEC := libvirt-python.spec +libvirt-python-BUILD-FROM-SRPM := yes +libvirt-python-STOCK-DEVEL-RPMS += pm-utils +# for 1.2.11 +libvirt-python-STOCK-DEVEL-RPMS += python-nose +# it would make sense to do something like this if we wanted to +# build against python3 as well, but for now I turned this feature off +# in libvirt-python +#ifeq "$(distro)" "Fedora" +#xxx if $(distrorelease) > 18 +#libvirt-python-STOCK-DEVEL-RPMS += python3-devel python3-nose python3-lxml +#endif +#endif +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 # local_libvirt # # DistributedRateLimiting @@ -228,6 +255,11 @@ 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 # @@ -252,23 +284,6 @@ 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-STOCK-DEVEL-RPMS := httpd-devel -mod_python-BUILD-FROM-SRPM := yes -ALL += mod_python -endif -endif - # # drupal # @@ -297,6 +312,8 @@ IN_MYPLC += www-register-wizard # # pcucontrol # +# WARNING: as of f27 I have to remove support for SSL in pcucontrol +# see pcucontrol.spec for details pcucontrol-MODULES := pcucontrol pcucontrol-SPEC := pcucontrol.spec ALL += pcucontrol @@ -370,16 +387,7 @@ IN_NODEIMAGE += pyplnet IN_MYPLC += pyplnet IN_BOOTCD += pyplnet -# -# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff -# -rvm-ruby-MODULES := rvm-ruby -rvm-ruby-SPEC := rpm/rvm-ruby.spec -rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel -# Since Oct 22. 2013, f18 has a new release of openssl that ruby is not too happy to build against -# turning this off for now, Christoph Dwertmann to monitor the status of this bug/incompatibility upstream -#ALL += rvm-ruby - +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f23 f24 f25 f27 f29)" # # OML measurement library # @@ -387,6 +395,7 @@ oml-MODULES := oml oml-STOCK-DEVEL-RPMS += sqlite-devel oml-SPEC := liboml.spec ALL += oml +endif # # bootcd @@ -491,33 +500,9 @@ 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 -myslice-STOCK-DEVEL-RPMS := python-django -myslice-STOCK-DEVEL-DEBS := python-django python-django-south -#ALL += myslice - -manifold-MODULES := manifold -manifold-SPEC := manifold.spec -#ALL += manifold