X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fns3%2Fccn%2Fns3ccnddceapplication.py;h=caa8e5b06eeb2ead3f597c218a89a15377fe20bb;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=a4325d965b82a0a18d7f8a44535ad8c996062303;hpb=2e80f0fafa0c2ef6a5f536efd4c868c91468f962;p=nepi.git

diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
index a4325d96..caa8e5b0 100644
--- a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
+++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2014 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,14 +17,14 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import clsinit_copy, ResourceState, reschedule_delay
+from nepi.execution.resource import clsinit_copy, ResourceState
 from nepi.resources.linux.ns3.ccn.ns3ccndceapplication import LinuxNS3CCNDceApplication
 
 import os
 
 @clsinit_copy
 class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
-    _rtype = "ns3::LinuxDceCCND"
+    _rtype = "linux::ns3::dce::CCND"
 
     @classmethod
     def _register_attributes(cls):
@@ -145,15 +144,15 @@ class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
                 " ecryptfs-utils-devel libxml2-devel automake gawk " 
                 " gcc gcc-c++ git pcre-devel make ")
         elif self.simulation.node.use_deb:
-            return ( " autoconf libssl-dev libexpat-dev libpcap-dev "
+            return ( " autoconf libssl-dev libexpat1-dev libpcap-dev "
                 " libecryptfs0 libxml2-utils automake gawk gcc g++ "
                 " git-core pkg-config libpcre3-dev make ")
         return ""
 
-
     @property
     def _sources(self):
-        return "http://www.ccnx.org/releases/ccnx-0.8.1.tar.gz"
+        #return "http://www.ccnx.org/releases/ccnx-0.8.1.tar.gz"
+        return "http://www.ccnx.org/releases/ccnx-0.8.2.tar.gz"
 
     @property
     def _build(self):
@@ -172,7 +171,7 @@ class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
                 " tar zxf ${SRC}/%(tar)s  && "
                 " cd %(version)s && "
                 " INSTALL_BASE=${BIN_DCE}/.. ./configure && "
-                " make MORE_LDLIBS=-pie && "
+                " make MORE_LDLIBS='-pie -rdynamic' && "
                 " make install && "
                 " cp ${BIN_DCE}/../bin/ccn* ${BIN_DCE} && "
                 " cd -"