git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing nasty ugly bug in DCE ccndc RM. Fix: Adding missing HOME environment set to...
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
ns3
/
ccn
/
ns3ccnddceapplication.py
diff --git
a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
index
6cd3207
..
226acf0
100644
(file)
--- a/
src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
+++ b/
src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
@@
-145,15
+145,15
@@
class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
" ecryptfs-utils-devel libxml2-devel automake gawk "
" gcc gcc-c++ git pcre-devel make ")
elif self.simulation.node.use_deb:
" 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 libexpat
1
-dev libpcap-dev "
" libecryptfs0 libxml2-utils automake gawk gcc g++ "
" git-core pkg-config libpcre3-dev make ")
return ""
" libecryptfs0 libxml2-utils automake gawk gcc g++ "
" git-core pkg-config libpcre3-dev make ")
return ""
-
@property
def _sources(self):
@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):
@property
def _build(self):
@@
-164,7
+164,7
@@
class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
return (
# Evaluate if ccnx binaries are already installed
" ( "
return (
# Evaluate if ccnx binaries are already installed
" ( "
- " test -f ${
SRC}/%(tar)s
&& "
+ " test -f ${
BIN_DCE}/ccnd
&& "
" echo 'binaries found, nothing to do' "
" ) || "
# If not, untar and build
" echo 'binaries found, nothing to do' "
" ) || "
# If not, untar and build
@@
-172,7
+172,7
@@
class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
" tar zxf ${SRC}/%(tar)s && "
" cd %(version)s && "
" INSTALL_BASE=${BIN_DCE}/.. ./configure && "
" 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 -"
" make install && "
" cp ${BIN_DCE}/../bin/ccn* ${BIN_DCE} && "
" cd -"