X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=29efc655544365605c7e54280adee904371decad;hb=b8a7e068d2fce5e2daf5d56138ad9ee46642581a;hp=2194a5039c980b090c22aee8e09d49e1d996c5fe;hpb=b212ca031dbce0376d8b5ce868bfd52e29d7c0d4;p=build.git diff --git a/lxc.mk b/lxc.mk index 2194a503..29efc655 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,47 +122,20 @@ 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 - -#################### libvirt version selection -# for now things are a bit confused -# on f18 we build with our own 1.0.4 and that works fine -# on f20 we have tried the mainstream (1.1.3) libvirt, -# as well as the latest 1.2.1 release, and both exhibit an issue that needs to be fixed -# in addition once this is done we might need to have f18+1.2.1 as well -# so for now we leave the option to set the following on the command line -# LIBVIRT=104 (for f18) -# LIBVIRT=mainstream (for f20) -# LIBVIRT=121 (for f18 or f20) - -# set default according to distro -ifeq "$(LIBVIRT)" "" -ifeq "$(DISTRONAME)" "f18" -LIBVIRT=104 -else -LIBVIRT=121 -endif endif -ifeq "$(LIBVIRT)" "104" -local_libvirt=true -separate_libvirt_python=false -libvirt-GITPATH := git://git.onelab.eu/libvirt.git@libvirt-1.0.4-3 -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 -ifeq "$(LIBVIRT)" "121" local_libvirt=true separate_libvirt_python=true -libvirt-GITPATH := git://git.onelab.eu/libvirt.git@1.2.1 -libvirt-python-GITPATH := git://git.onelab.eu/libvirt-python.git@1.2.1 -endif - -ifeq "$(LIBVIRT)" "mainstream" -local_libvirt=false -endif # # libvirt @@ -181,24 +146,21 @@ 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 netcf-devel -endif +libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel +# 1.2.11 +libvirt-STOCK-DEVEL-RPMS += wireshark-devel ALL += libvirt IN_NODEREPO += libvirt IN_NODEIMAGE += libvirt + endif # @@ -209,12 +171,23 @@ 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 # @@ -278,6 +251,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 # @@ -403,16 +384,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 # @@ -524,33 +495,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