--- a/bakeconf.xml Sat Apr 20 09:50:29 2013 -0700
+++ b/bakeconf.xml Mon Apr 22 10:27:04 2013 +0900
@@ -3,8 +3,9 @@
<module name="dce-ns3">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
- <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
+ <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="ns-3-dev-dce" optional="False"/>
<depends_on name="elf-loader" optional="True"/>
@@ -13,15 +14,16 @@
<depends_on name="wget" optional="True"/>
<depends_on name="thttpd" optional="True"/>
<build type="waf" objdir="build">
- <attribute name="configure_arguments" value="configure --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --prefix=$INSTALLDIR"/>
- <!-- attribute name="post_installation" value="cd $SRCDIR; ./test.py" -->
+ <attribute name="configure_arguments" value="configure --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --prefix=$INSTALLDIR"/>
+ <!-- attribute name="post_installation" value="cd $SRCDIR; ./test.py" -->
</build>
</module>
<module name="dce-linux">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
- <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
+ <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="elf-loader" optional="True"/>
<depends_on name="net-next-sim-2.6.36" optional="False"/>
@@ -32,15 +34,16 @@
<depends_on name="thttpd" optional="True"/>
<depends_on name="ns-3-dev-dce" optional="False"/>
<build type="waf" objdir="yes" sourcedir="ns-3-dce">
- <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../net-next-sim-2.6.36/arch"/>
- <!-- attribute name="post_installation" value="cd $SRCDIR; ./test.py"/ -->
+ <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../net-next-sim-2.6.36/arch"/>
+ <!-- attribute name="post_installation" value="cd $SRCDIR; ./test.py"/ -->
</build>
</module>
<module name="dce-linux-gcov">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
- <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
+ <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="elf-loader" optional="True"/>
<depends_on name="net-next-sim-2.6.36" optional="False"/>
@@ -53,14 +56,15 @@
<depends_on name="dce-umip" optional="False"/>
<depends_on name="ns-3-dev-dce" optional="False"/>
<build type="waf" objdir="yes" sourcedir="ns-3-dce">
- <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../net-next-sim-2.6.36/arch --enable-gcov"/>
+ <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../net-next-sim-2.6.36/arch --enable-gcov"/>
</build>
</module>
<module name="dce-quagga-inkernel">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-quagga"/>
- <attribute name="module_directory" value="ns-3-dce/myscripts/ns-3-dce-quagga/"/>
+ <attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-quagga"/>
+ <attribute name="module_directory" value="ns-3-dce/myscripts/ns-3-dce-quagga/"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="dce-linux-inkernel" optional="False"/>
<depends_on name="quagga" optional="False"/>
@@ -71,8 +75,9 @@
<module name="dce-umip-inkernel">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-umip"/>
- <attribute name="module_directory" value="ns-3-dce/myscripts/ns-3-dce-umip/"/>
+ <attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-umip"/>
+ <attribute name="module_directory" value="ns-3-dce/myscripts/ns-3-dce-umip/"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="dce-linux-inkernel" optional="False"/>
<depends_on name="dce-quagga-inkernel" optional="False"/>
@@ -83,8 +88,9 @@
<module name="dce-linux-inkernel">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
- <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
+ <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="elf-loader" optional="True"/>
<depends_on name="iproute" optional="False"/>
@@ -92,8 +98,8 @@
<depends_on name="ccnx" optional="True"/>
<depends_on name="ns-3-dev-dce" optional="False"/>
<build type="waf" objdir="yes" sourcedir="ns-3-dce">
- <!-- assume the bake.py build is executed under arch/sim/test/buildtop/ -->
- <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../../../../../"/>
+ <!-- assume the bake.py build is executed under arch/sim/test/buildtop/ -->
+ <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../../../../../"/>
</build>
</module>
@@ -104,7 +110,7 @@
<attribute name="revision" value="mptcp_v0.86"/>
</source>
<build type="make" objdir="no">
- <attribute name="pre_installation" value="cd $SRCDIR;git remote add dce git://github.com/thehajime/net-next-sim.git; git fetch dce; git merge dce/sim-ns3-3.5.0-branch; echo 'CONFIG_MPTCP=y' >> arch/sim/defconfig; sed 's/CONFIG_SYN_COOKIES=y/\#CONFIG_SYN_COOKIES=y/' arch/sim/defconfig >a; mv a arch/sim/defconfig"/>
+ <attribute name="pre_installation" value="cd $SRCDIR;git remote add dce git://github.com/thehajime/net-next-sim.git; git fetch dce; git merge dce/sim-ns3-3.5.0-branch; echo 'CONFIG_MPTCP=y' >> arch/sim/defconfig; sed 's/CONFIG_SYN_COOKIES=y/\#CONFIG_SYN_COOKIES=y/' arch/sim/defconfig >a; mv a arch/sim/defconfig"/>
<attribute name="configure_arguments" value="defconfig ARCH=sim"/>
<attribute name="build_arguments" value="library ARCH=sim"/>
<attribute name="no_installation" value="True"/>
@@ -124,19 +130,20 @@
<depends_on name="libsysfs-dev" optional="False"/>
<depends_on name="libssl-dev" optional="False"/>
<build type="make" objdir="yes">
- <attribute name="patch" value="$SRCDIR/../ns-3-dce/utils/iproute-mptcp.patch"/>
- <attribute name="pre_installation" value="$SRCDIR/configure"/>
- <attribute name="LDFLAGS" value="-pie"/>
- <attribute name="ignore_predefined_flags" value="True"/>
+ <attribute name="patch" value="$SRCDIR/../ns-3-dce/utils/iproute-mptcp.patch"/>
+ <attribute name="pre_installation" value="$SRCDIR/configure"/>
+ <attribute name="LDFLAGS" value="-pie"/>
+ <attribute name="ignore_predefined_flags" value="True"/>
<attribute name="install_arguments" value="DESTDIR=$INSTALLDIR" />
- <attribute name="build_arguments" value="CCOPTS+=-fpic CCOPTS+=-D_GNU_SOURCE CCOPTS+=-O0 CCOPTS+=-U_FORTIFY_SOURCE LDFLAGS=-pie DEFINES+=-I$SRCDIR/../mptcp/include"/>
+ <attribute name="build_arguments" value="CCOPTS+=-fpic CCOPTS+=-D_GNU_SOURCE CCOPTS+=-O0 CCOPTS+=-U_FORTIFY_SOURCE LDFLAGS=-pie DEFINES+=-I$SRCDIR/../mptcp/include"/>
</build>
</module>
<module name="dce-linux-mptcp">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
- <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
+ <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="elf-loader" optional="True"/>
<depends_on name="mptcp_v0.86" optional="False"/>
@@ -144,22 +151,23 @@
<depends_on name="iperf" optional="True"/>
<depends_on name="ns-3-dev-dce" optional="False"/>
<build type="waf" objdir="yes" sourcedir="ns-3-dce">
- <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../mptcp/arch"/>
+ <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../mptcp/arch"/>
</build>
</module>
<module name="dce-linux-mptcp-inkernel">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
- <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="url" value="http://code.nsnam.org/ns-3-dce"/>
+ <attribute name="module_directory" value="ns-3-dce"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="elf-loader" optional="True"/>
<depends_on name="iproute-mptcp" optional="False"/>
<depends_on name="iperf" optional="True"/>
<depends_on name="ns-3-dev-dce" optional="False"/>
<build type="waf" objdir="yes" sourcedir="ns-3-dce">
- <!-- assume the bake.py build is executed under arch/sim/test/buildtop/ -->
- <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../../../../../"/>
+ <!-- assume the bake.py build is executed under arch/sim/test/buildtop/ -->
+ <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --with-ns3=$INSTALLDIR --with-elf-loader=$INSTALLDIR/lib --enable-kernel-stack=$SRCDIR/../../../../../"/>
</build>
</module>
@@ -189,26 +197,26 @@
<module name="ccnx">
<source type="archive">
- <attribute name="url" value="http://www.ccnx.org/releases/ccnx-0.6.2.tar.gz"/>
- <attribute name="extract_directory" value="ccnx-0.6.2"/>
+ <attribute name="url" value="http://www.ccnx.org/releases/ccnx-0.6.2.tar.gz"/>
+ <attribute name="extract_directory" value="ccnx-0.6.2"/>
</source>
<depends_on name="libpcap-dev" optional="False"/>
<depends_on name="libexpat-dev" optional="False"/>
<build type="make" objdir="yes">
- <attribute name="pre_installation" value="cd $SRCDIR;INSTALL_BASE=$INSTALLDIR ./configure;mkdir $INSTALLDIR/include;mkdir $INSTALLDIR/lib;mkdir $INSTALLDIR/bin"/>
- <attribute name="build_arguments" value="MORE_LDLIBS=-pie"/>
+ <attribute name="pre_installation" value="cd $SRCDIR;INSTALL_BASE=$INSTALLDIR ./configure;mkdir $INSTALLDIR/include;mkdir $INSTALLDIR/lib;mkdir $INSTALLDIR/bin"/>
+ <attribute name="build_arguments" value="MORE_LDLIBS=-pie"/>
<attribute name="new_variable" value="INSTALL_BASE=$INSTALLDIR" />
</build>
</module>
<module name="iperf">
<source type="archive">
- <attribute name="url" value="http://iperf.fr/download/iperf_2.0.5/iperf-2.0.5-source.tar.gz"/>
- <attribute name="extract_directory" value="iperf-2.0.5"/>
+ <attribute name="url" value="http://iperf.fr/download/iperf_2.0.5/iperf-2.0.5-source.tar.gz"/>
+ <attribute name="extract_directory" value="iperf-2.0.5"/>
</source>
<build type="make" objdir="yes">
- <attribute name="pre_installation" value="cd $SRCDIR;./configure --prefix=$INSTALLDIR"/>
- <attribute name="patch" value="$SRCDIR/../ns-3-dce/utils/iperf_4_dce.patch"/>
+ <attribute name="pre_installation" value="cd $SRCDIR;./configure --prefix=$INSTALLDIR"/>
+ <attribute name="patch" value="$SRCDIR/../ns-3-dce/utils/iperf_4_dce.patch"/>
</build>
</module>
@@ -274,7 +282,7 @@
<module name="iproute">
<source type="archive">
- <attribute name="url" value="http://www.linuxgrill.com/anonymous/iproute2/NEW-OSDL/iproute2-2.6.38.tar.bz2"/>
+ <attribute name="url" value="http://www.linuxgrill.com/anonymous/iproute2/NEW-OSDL/iproute2-2.6.38.tar.bz2"/>
</source>
<depends_on name="libdb-dev" optional="False"/>
<depends_on name="bison" optional="False"/>
@@ -282,21 +290,22 @@
<depends_on name="libsysfs-dev" optional="False"/>
<depends_on name="libssl-dev" optional="False"/>
<build type="make" objdir="yes">
- <attribute name="pre_installation" value="$SRCDIR/configure"/>
- <attribute name="LDFLAGS" value="-pie"/>
- <attribute name="ignore_predefined_flags" value="True"/>
+ <attribute name="pre_installation" value="$SRCDIR/configure"/>
+ <attribute name="LDFLAGS" value="-pie"/>
+ <attribute name="ignore_predefined_flags" value="True"/>
<attribute name="install_arguments" value="DESTDIR=$INSTALLDIR" />
- <attribute name="build_arguments" value="CCOPTS+=-fpic CCOPTS+=-D_GNU_SOURCE CCOPTS+=-O0 CCOPTS+=-U_FORTIFY_SOURCE LDFLAGS=-pie"/>
+ <attribute name="build_arguments" value="CCOPTS+=-fpic CCOPTS+=-D_GNU_SOURCE CCOPTS+=-O0 CCOPTS+=-U_FORTIFY_SOURCE LDFLAGS=-pie"/>
</build>
</module>
<module name="ns-3-dev-dce">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/ns-3-dev"/>
+ <attribute name="url" value="http://code.nsnam.org/ns-3-dev"/>
+ <!-- attribute name="revision" value="ns-3.17"/ -->
</source>
<depends_on name="pybindgen-user" optional="True"/>
<build type="waf" objdir="yes">
- <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-tests --with-pybindgen=$SRCDIR/../pybindgen-user"/>
+ <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --enable-tests --with-pybindgen=$SRCDIR/../pybindgen-user"/>
</build>
</module>
@@ -370,13 +379,13 @@
<module name="iputils">
<source type="archive">
- <attribute name="url" value="http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2"/>
+ <attribute name="url" value="http://www.skbuff.net/iputils/iputils-s20101006.tar.bz2"/>
</source>
<!-- note: iputils does not have 'make install' -->
<build type="inline" classname="IputilsModuleBuild">
- <attribute name="patch" value="$SRCDIR/../ns-3-dce/myscripts/ns-3-dce-quagga/utils/iputils-ping6.patch"/>
- <attribute name="supported_os" value="linux;linux2"/>
- <code>class IputilsModuleBuild(InlineModuleBuild):
+ <attribute name="patch" value="$SRCDIR/../ns-3-dce/myscripts/ns-3-dce-quagga/utils/iputils-ping6.patch"/>
+ <attribute name="supported_os" value="linux;linux2"/>
+ <code>class IputilsModuleBuild(InlineModuleBuild):
def __init__(self):
InlineModuleBuild.__init__(self)
def build(self, env, jobs):
@@ -400,20 +409,22 @@
<!-- umip related modules -->
<module name="dce-umip">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-umip"/>
- <attribute name="module_directory" value="ns-3-dce/myscripts/ns-3-dce-umip/"/>
+ <attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-umip"/>
+ <attribute name="module_directory" value="ns-3-dce/myscripts/ns-3-dce-umip/"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="dce-linux" optional="False"/>
<depends_on name="dce-quagga" optional="False"/>
<depends_on name="umip" optional="False"/>
<build type="none">
- <!-- attribute name="configure_arguments" value="configure -prefix=$INSTALLDIR"/ -->
+ <!-- attribute name="configure_arguments" value="configure -prefix=$INSTALLDIR"/ -->
</build>
</module>
<module name="umip">
<source type="git">
<attribute name="url" value="git://git.umip.org/umip.git"/>
+ <attribute name="revision" value="v1.0"/>
</source>
<build type="autotools" objdir="no">
<attribute name="maintainer" value="yes" />
@@ -426,14 +437,15 @@
<!-- quagga related modules -->
<module name="dce-quagga">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-quagga"/>
- <attribute name="module_directory" value="ns-3-dce/myscripts/ns-3-dce-quagga/"/>
+ <attribute name="url" value="http://code.nsnam.org/thehajime/ns-3-dce-quagga"/>
+ <attribute name="module_directory" value="ns-3-dce/myscripts/ns-3-dce-quagga/"/>
+ <attribute name="revision" value="dce-1.0-rc1"/>
</source>
<depends_on name="dce-linux" optional="False"/>
<depends_on name="quagga" optional="False"/>
<depends_on name="iputils" optional="False"/>
<build type="none">
- <!-- attribute name="configure_arguments" value="configure -prefix=$INSTALLDIR"/ -->
+ <!-- attribute name="configure_arguments" value="configure -prefix=$INSTALLDIR"/ -->
</build>
</module>
@@ -463,15 +475,15 @@
<module name="quagga">
<source type="archive">
- <!-- some of mirror sever of gnu.org isn't available.. -->
- <!-- attribute name="url" value="http://download.savannah.gnu.org/releases/quagga/quagga-0.99.20.tar.gz"/ -->
- <attribute name="url" value="http://pkgs.fedoraproject.org/lookaside/pkgs/quagga/quagga-0.99.20.tar.gz/64cc29394eb8a4e24649d19dac868f64/quagga-0.99.20.tar.gz"/>
- <attribute name="extract_directory" value="quagga-0.99.20"/>
+ <!-- some of mirror sever of gnu.org isn't available.. -->
+ <!-- attribute name="url" value="http://download.savannah.gnu.org/releases/quagga/quagga-0.99.20.tar.gz"/ -->
+ <attribute name="url" value="http://pkgs.fedoraproject.org/lookaside/pkgs/quagga/quagga-0.99.20.tar.gz/64cc29394eb8a4e24649d19dac868f64/quagga-0.99.20.tar.gz"/>
+ <attribute name="extract_directory" value="quagga-0.99.20"/>
</source>
<depends_on name="indent" optional="False"/>
<depends_on name="gawk" optional="False"/>
<build type="make" objdir="yes">
- <attribute name="pre_installation" value="cd $SRCDIR; CFLAGS='-fPIC -g' LDFLAGS=-pie ./configure --disable-shared --enable-static --disable-user --disable-group --disable-capabilities --prefix=$INSTALLDIR"/>
+ <attribute name="pre_installation" value="cd $SRCDIR; CFLAGS='-fPIC -g' LDFLAGS=-pie ./configure --disable-shared --enable-static --disable-user --disable-group --disable-capabilities --prefix=$INSTALLDIR"/>
<attribute name="install_arguments" value="-n" />
<attribute name="post_installation" value="cd $SRCDIR; mkdir $INSTALLDIR/bin_dce; /bin/cp zebra/zebra $INSTALLDIR/bin_dce;/bin/cp ripd/ripd $INSTALLDIR/bin_dce;/bin/cp ripngd/ripngd $INSTALLDIR/bin_dce;/bin/cp ospfd/ospfd $INSTALLDIR/bin_dce;/bin/cp ospf6d/ospf6d $INSTALLDIR/bin_dce;/bin/cp bgpd/bgpd $INSTALLDIR/bin_dce"/>
</build>
@@ -647,15 +659,15 @@
<module name="pybindgen-user">
<source type="bazaar">
- <attribute name="url" value="https://launchpad.net/pybindgen"/>
- <attribute name="revision" value="revno:825"/>
+ <attribute name="url" value="https://launchpad.net/pybindgen"/>
+ <attribute name="revision" value="revno:825"/>
</source>
<depends_on name="python-dev" optional="False"/>
<depends_on name="pygraphviz" optional="False"/>
<depends_on name="pygoocanvas" optional="False"/>
<build type="waf" objdir="yes">
- <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --disable-pygccxml"/>
- <attribute name="build_arguments" value="--generate-version"/>
+ <attribute name="configure_arguments" value="configure --prefix=$INSTALLDIR --disable-pygccxml"/>
+ <attribute name="build_arguments" value="--generate-version"/>
</build>
</module>
@@ -770,12 +782,12 @@
<module name="elf-loader">
<source type="mercurial">
- <attribute name="url" value="http://code.nsnam.org/thehajime/elf-loader"/>
+ <attribute name="url" value="http://code.nsnam.org/thehajime/elf-loader"/>
</source>
<depends_on name="libc-debug" optional="False"/>
<build type="make" objdir="no">
- <attribute name="configure_arguments" value="vdl-config.h"/>
- <attribute name="install_arguments" value="PREFIX=$INSTALLDIR"/>
+ <attribute name="configure_arguments" value="vdl-config.h"/>
+ <attribute name="install_arguments" value="PREFIX=$INSTALLDIR"/>
</build>
</module>