X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=6855416fc6a20e0eb56063eacd107724c4a93043;hb=refs%2Fheads%2Fomf-friendly;hp=d007a92fc03ec983cb8a209c9f2df3087d7187ed;hpb=84ac86eb95148c45864b8d9d59a75f3361254377;p=build.git diff --git a/lxc.mk b/lxc.mk index d007a92f..6855416f 100644 --- a/lxc.mk +++ b/lxc.mk @@ -38,8 +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" +# this module won't build yet under f20 +ifeq "$(DISTRONAME)" "f18" ipfwroot-MODULES := ipfw ipfwroot-SPEC := planetlab/ipfwroot.spec ALL += ipfwroot @@ -48,7 +48,7 @@ IN_NODEIMAGE += ipfwroot ipfwslice-MODULES := ipfw ipfwslice-SPEC := planetlab/ipfwslice.spec ALL += ipfwslice -#endif +endif # # comgt - a companion to umts tools @@ -135,36 +135,52 @@ 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" +#################### 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 -#endif +separate_libvirt_python=true -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-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 +libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel +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 # 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' +libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad +libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel ALL += libvirt IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt + +endif + +# +## 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 # @@ -190,33 +206,12 @@ ALL += pf2slice #ALL += mom #IN_NODEIMAGE += mom -# -# inotify-tools - local import -# rebuild this on centos5 (not found) - see yumexclude -# -local_inotify_tools=false -ifeq "$(DISTRONAME)" "centos5" -local_inotify_tools=true -endif - -ifeq "$(DISTRONAME)" "sl6" -local_inotify_tools=true -endif - -ifeq "$(local_inotify_tools)" "true" -inotify-tools-MODULES := inotify-tools -inotify-tools-SPEC := inotify-tools.spec -inotify-tools-BUILD-FROM-SRPM := yes -IN_NODEIMAGE += inotify-tools -ALL += inotify-tools -endif - # # openvswitch # # openvswitch-MODULES := openvswitch # openvswitch-SPEC := openvswitch.spec -# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel +# openvswitch-STOCK-DEVEL-RPMS += kernel-devel # IN_NODEIMAGE += openvswitch # # build only on f14 as f16 has this natively # ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)" @@ -229,10 +224,7 @@ endif vsys-MODULES := vsys vsys-SPEC := vsys.spec # ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it -vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs -ifeq "$(local_inotify_tools)" "true" -vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel -endif +vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs IN_NODEIMAGE += vsys ALL += vsys @@ -276,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-DEVEL-RPMS := httpd-devel -mod_python-BUILD-FROM-SRPM := yes -ALL += mod_python -endif -endif - # # drupal # @@ -330,7 +305,7 @@ ALL += pcucontrol # #monitor-MODULES := monitor #monitor-SPEC := Monitor.spec -#monitor-DEVEL-RPMS += net-snmp net-snmp-devel +#monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel #ALL += monitor #IN_NODEIMAGE += monitor @@ -395,18 +370,20 @@ IN_MYPLC += pyplnet IN_BOOTCD += pyplnet # -# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff +# 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-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel +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 # oml-MODULES := oml -oml-DEVEL-RPMS += sqlite-devel +oml-STOCK-DEVEL-RPMS += sqlite-devel oml-SPEC := liboml.spec ALL += oml @@ -513,32 +490,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-DEVEL-RPMS := python-django -#ALL += myslice - -manifold-MODULES := manifold -manifold-SPEC := manifold.spec -#ALL += manifold