X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=c83bff8d6198f405644d296852c94368a935aca1;hb=7ef676849be84b2ec9c964eb48130a98c3dc85c1;hp=aa49d48c756e98c86f96f958789ef4c3221b2968;hpb=47440e484fabb875762e788fc10565893f068d00;p=build.git diff --git a/lxc.mk b/lxc.mk index aa49d48c..c83bff8d 100644 --- a/lxc.mk +++ b/lxc.mk @@ -38,8 +38,6 @@ IN_NODEIMAGE += procprotect # # ipfw: root context module, and slice companion # -# this module won't build yet under f20 -ifeq "$(DISTRONAME)" "f18" ipfwroot-MODULES := ipfw ipfwroot-SPEC := planetlab/ipfwroot.spec ALL += ipfwroot @@ -48,7 +46,6 @@ IN_NODEIMAGE += ipfwroot ipfwslice-MODULES := ipfw ipfwslice-SPEC := planetlab/ipfwslice.spec ALL += ipfwslice -endif # # comgt - a companion to umts tools @@ -101,15 +98,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,64 +122,73 @@ IN_NODEIMAGE += codemux # # fprobe-ulog # +# xxx temporarily turning this off on f20 and f21 +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21)" fprobe-ulog-MODULES := fprobe-ulog fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_NODEIMAGE += fprobe-ulog +endif + +#################### 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 -#################### 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)" 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 # 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 # 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-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 -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-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 # @@ -251,6 +252,14 @@ vsys-scripts-SPEC := root-context/vsys-scripts.spec IN_NODEIMAGE += vsys-scripts ALL += vsys-scripts +# xxx temporarily turning this off on f21 +ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f21)" +vsys-wrapper-MODULES := vsys-scripts +vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec +IN_SLICEIMAGE += vsys-wrapper +ALL += vsys-wrapper +endif + # # bind_public # @@ -275,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 # @@ -393,16 +385,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 # @@ -514,33 +496,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