Skip to content

Commit b64e0fa

Browse files
mauriciovasquezbernalacloudiator
authored andcommitted
Documentation: fix installation guide (#145)
- update list of dependencies - use correct version of libtins - include direct instructions for libyang-dev - remove polycube-tools instructions - use last working version of pistache Solves: #143 Signed-off-by: Mauricio Vasquez B <mauriciovasquezbernal@gmail.com>
1 parent b50b84c commit b64e0fa

2 files changed

Lines changed: 30 additions & 31 deletions

File tree

Documentation/installation.rst

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -91,63 +91,60 @@ Install dependencies
9191
::
9292

9393
# Install polycube dependencies
94-
sudo apt-get -y install bison build-essential cmake flex git libedit-dev libllvm5.0 \
95-
llvm-5.0-dev libclang-5.0-dev python zlib1g-dev libelf-dev nmap \
96-
software-properties-common libnl-route-3-dev libnl-genl-3-dev \
97-
curl uuid-dev build-essential autoconf libtool
94+
sudo apt-get -y install git build-essential cmake bison flex \
95+
libelf-dev libllvm5.0 llvm-5.0-dev libclang-5.0-dev \
96+
libnl-route-3-dev libnl-genl-3-dev uuid-dev pkg-config \
97+
autoconf libtool m4 automake libssl-dev kmod jq bash-completion \
98+
gnupg2
9899

100+
Install libyang-dev
101+
###################
99102

100-
Install libyang
101-
^^^^^^^^^^^^^^^^
103+
::
104+
105+
sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/liberouter/xUbuntu_16.04/ /' > /etc/apt/sources.list.d/home:liberouter.list"
106+
wget -nv https://download.opensuse.org/repositories/home:liberouter/xUbuntu_16.04/Release.key -O Release.key
107+
sudo apt-key add - < Release.key
108+
sudo apt-get update
109+
sudo apt-get install libyang-dev
102110

103-
Please check the `libyang installation documentation <https://software.opensuse.org//download.html?project=home%3Aliberouter&package=libyang>`_.
111+
112+
If you are using another operating system please check the `libyang installation documentation <https://software.opensuse.org//download.html?project=home%3Aliberouter&package=libyang>`_.
104113

105114
Install pistache
106-
^^^^^^^^^^^^^^^^
115+
################
107116

108117
::
109118

110119
# Install Pistache (a library to create web servers that is used in polycubed)
111120
git clone https://github.com/oktal/pistache.git
112121
cd pistache
122+
# use last known working version
123+
git checkout 117db02eda9d63935193ad98be813987f6c32b33
113124
git submodule update --init
114125
mkdir build && cd build
115-
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DPISTACHE_SSL=ON ..
126+
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DPISTACHE_USE_SSL=ON ..
116127
make -j $(getconf _NPROCESSORS_ONLN)
117128
sudo make install
118129

119130

120131
Install libtins
121-
^^^^^^^^^^^^^^^
132+
###############
133+
122134
::
123135

124136
# Install libtins (a library for network packet sniffing and crafting, used to create packets)
125-
git clone https://github.com/mfontanini/libtins.git
137+
git clone --branch v3.5 https://github.com/mfontanini/libtins.git
126138
cd libtins
127139
mkdir build && cd build
128140
cmake -DLIBTINS_ENABLE_CXX11=ON -DLIBTINS_BUILD_EXAMPLES=OFF \
129-
-DLIBTINS_BUILD_TESTS=OFF -DLIBTINS_ENABLE_DOT11=OFF \
130-
-DLIBTINS_ENABLE_PCAP=OFF -DLIBTINS_ENABLE_WPA2=OFF \
131-
-DLIBTINS_ENABLE_WPA2_CALLBACKS=OFF
141+
-DLIBTINS_BUILD_TESTS=OFF -DLIBTINS_ENABLE_DOT11=OFF \
142+
-DLIBTINS_ENABLE_PCAP=OFF -DLIBTINS_ENABLE_WPA2=OFF \
143+
-DLIBTINS_ENABLE_WPA2_CALLBACKS=OFF ..
132144
make -j $(getconf _NPROCESSORS_ONLN)
133145
sudo make install
134146
sudo ldconfig
135147

136-
Install polycube-tools
137-
^^^^^^^^^^^^^^^^^^^^^^
138-
139-
Install it only if you are a developer
140-
141-
::
142-
143-
git clone https://github.com/mauriciovasquezbernal/polycube-tools
144-
cd polycube-tools
145-
mkdir build && cd build
146-
cmake ..
147-
make -j $(getconf _NPROCESSORS_ONLN)
148-
sudo make install
149-
150-
151148
Installing polycube
152149
^^^^^^^^^^^^^^^^^^^
153150

scripts/install.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,15 @@ echo "Install pistache"
9696
cd $WORKDIR
9797
set +e
9898
if [ ! -d pistache ]; then
99-
git clone https://github.com/oktal/pistache.git --depth=1
99+
git clone https://github.com/oktal/pistache.git
100100
fi
101101

102102
cd pistache
103+
# use last known working version
104+
git checkout 117db02eda9d63935193ad98be813987f6c32b33
103105
git submodule update --init
104106
mkdir -p build && cd build
105-
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DPISTACHE_SSL=ON ..
107+
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DPISTACHE_USE_SSL=ON ..
106108
make -j $(getconf _NPROCESSORS_ONLN)
107109
$SUDO make install
108110

0 commit comments

Comments
 (0)