deprecate ejabberd in planetlab

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 840c7d1..ad94031 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -33,7 +33,6 @@ PLCRT-SVNPATH                 := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-2
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-2
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2

-ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-3

 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 ###
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-3
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 ###
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-3

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index bd8a29d..baf10f9 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-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.planet-lab.org/pyopenssl.git@pyopenssl-0.9-2
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2
 pyopenssl-GITPATH               := git://git.planet-lab.org/pyopenssl.git@pyopenssl-0.9-2
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2

-ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-3

 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 ###
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-3
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-11
 ###
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-2.1-3

diff --git a/planetlab.mk b/planetlab.mk
index a2a378e..0adf35f 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -341,19 +341,6 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
 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__
 build_sfa=true
 ifeq "$(DISTRONAME)" "centos5"
 # sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
 build_sfa=true
 ifeq "$(DISTRONAME)" "centos5"