X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=cc3dfa5ca21f5fb11e8c4eec816d3722cf6c46ff;hb=44eeb2f0c9913688508a6d4759c1f876f3172cbb;hp=be692d2aa5c2d0bea6ce26d0669298f4cc159a06;hpb=2200146123050527ad5311a5199be40f9053d1bc;p=build.git diff --git a/lxc.mk b/lxc.mk index be692d2a..cc3dfa5c 100644 --- a/lxc.mk +++ b/lxc.mk @@ -135,21 +135,18 @@ fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_NODEIMAGE += fprobe-ulog -#################### using our own libvirt on f18, and the stock version later on -local_libvirt=false -separate_libvirt_python=false -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)" +#################### 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 -ifeq "$(DISTRONAME)" "f20" separate_libvirt_python=true -endif -endif - -ifeq "$(local_libvirt)" "true" # # libvirt # +ifeq "$(local_libvirt)" "true" + libvirt-MODULES := libvirt libvirt-SPEC := libvirt.spec libvirt-BUILD-FROM-SRPM := yes @@ -160,33 +157,30 @@ 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 - -ifeq "$(DISTRONAME)" "f16" -libvirt-STOCK-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)" "$(filter $(DISTRONAME),f18 f20)" libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad -libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel -endif -libvirt-RPMFLAGS := --define 'packager PlanetLab' +libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel ALL += libvirt IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt + endif -ifeq "$(separate_libvirt_python)" "true" # ## 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 += gnutls-utils nc 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 # @@ -274,23 +268,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 # @@ -392,16 +369,6 @@ 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 - # # OML measurement library # @@ -513,33 +480,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