From: Thierry Parmentelat Date: Thu, 29 Mar 2012 13:33:44 +0000 (+0200) Subject: deprecated ejabberd - we use openfire anyways X-Git-Tag: 5.0-rc27~80 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=dbd19c91d99ce1c9b9c45929af2c533c6958e08a;p=build.git deprecated ejabberd - we use openfire anyways --- diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index 43e7191f..ec4c6f57 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -41,7 +41,6 @@ PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 pyopenssl-GITPATH := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2 ### pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-2 -ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-3 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### diff --git a/onelab.mk b/onelab.mk index 3daedd1a..ec7457dc 100644 --- a/onelab.mk +++ b/onelab.mk @@ -372,19 +372,6 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects -# -# ejabberd -# -ejabberd-MODULES := ejabberd -ejabberd-SPEC := ejabberd.spec -ejabberd-BUILD-FROM-SRPM := yes -ejabberd-DEVEL-RPMS += erlang pam-devel hevea -# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3 -# so, this is relevant on f8 and centos5 only -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)" -ALL += ejabberd -endif - # sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ # In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model build_sfa=true