X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=e50793cb96988ae283aa2f93bc665b1ae696e0cd;hb=ce660038ed58ec2f62b6e0d16702db47680f4f61;hp=6d9db043abcd77b178ba8b4025507db40e847c07;hpb=b43dca818a496d844c8360059b1bc0e4e0c5b15d;p=build.git diff --git a/lxc.mk b/lxc.mk index 6d9db043..e50793cb 100644 --- a/lxc.mk +++ b/lxc.mk @@ -8,23 +8,15 @@ # see doc in Makefile # -### the madwifi drivers ahip with fedora16's kernel rpm +### the madwifi drivers ship with fedora16's kernel rpm # -# lxctools: scripts for entering containers +# lxc-userspace: scripts for entering containers # -lxctools-MODULES := lxctools -lxctools-SPEC := lxctools.spec -ALL += lxctools -IN_NODEIMAGE += lxctools - -# -# lxcsu: root context module for entering namespaces -# -lxcsu-MODULES := lxcsu -lxcsu-SPEC := lxcsu.spec -ALL += lxcsu -IN_NODEIMAGE += lxcsu +lxc-userspace-MODULES := lxc-userspace +lxc-userspace-SPEC := lxc-userspace.spec +ALL += lxc-userspace +IN_NODEIMAGE += lxc-userspace # # @@ -58,6 +50,30 @@ ipfwslice-SPEC := planetlab/ipfwslice.spec ALL += ipfwslice #endif +# +# comgt - a companion to umts tools +# +comgt-MODULES := comgt +comgt-SPEC := comgt.spec +IN_NODEIMAGE += comgt +ALL += comgt + +# +# umts: root context stuff +# +umts-backend-MODULES := planetlab-umts-tools +umts-backend-SPEC := backend.spec +IN_NODEIMAGE += umts-backend +ALL += umts-backend + +# +# umts: slice tools +# +umts-frontend-MODULES := planetlab-umts-tools +umts-frontend-SPEC := frontend.spec +IN_SLICEIMAGE += umts-frontend +ALL += umts-frontend + # # NodeUpdate # @@ -133,17 +149,17 @@ 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 +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 ifeq "$(DISTRONAME)" "f16" -libvirt-DEVEL-RPMS += libnl-devel libudev-devel +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)" "f18" -libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad -libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 +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' ALL += libvirt @@ -200,7 +216,7 @@ endif # # openvswitch-MODULES := openvswitch # openvswitch-SPEC := openvswitch.spec -# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel +# openvswitch-LOCAL-STOCK-DEVEL-RPMS += kernel-devel # IN_NODEIMAGE += openvswitch # # build only on f14 as f16 has this natively # ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)" @@ -213,9 +229,9 @@ 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 +vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs ifeq "$(local_inotify_tools)" "true" -vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel +vsys-LOCAL-STOCK-DEVEL-RPMS += inotify-tools inotify-tools-devel endif IN_NODEIMAGE += vsys ALL += vsys @@ -244,6 +260,9 @@ bind_public-SPEC := bind_public.spec IN_SLICEIMAGE += bind_public ALL += bind_public +# +# sliver-openvswitch +# sliver-openvswitch-MODULES := sliver-openvswitch sliver-openvswitch-SPEC := sliver-openvswitch.spec IN_SLICEIMAGE += sliver-openvswitch @@ -257,6 +276,23 @@ 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 # @@ -294,7 +330,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 @@ -359,19 +395,20 @@ IN_MYPLC += pyplnet IN_BOOTCD += pyplnet # -# OMF resource controller +# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff # -omf-resctl-MODULES := omf -omf-resctl-SPEC := omf-resctl.spec -ALL += omf-resctl -IN_SLICEIMAGE += omf-resctl +rvm-ruby-MODULES := rvm-ruby +rvm-ruby-SPEC := rpm/rvm-ruby.spec +rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel +ALL += rvm-ruby # -# OMF exp controller +# OML measurement library # -omf-expctl-MODULES := omf -omf-expctl-SPEC := omf-expctl.spec -ALL += omf-expctl +oml-MODULES := oml +oml-STOCK-DEVEL-RPMS += sqlite-devel +oml-SPEC := liboml.spec +ALL += oml # # bootcd @@ -499,6 +536,8 @@ 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