Skip to content

Commit 8fe66ac

Browse files
committed
all components should be good to go for ubuntu 16.04
1 parent 6355e38 commit 8fe66ac

1 file changed

Lines changed: 15 additions & 33 deletions

File tree

build.sh

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright 2014 Range Networks, Inc.
3+
# Copyright 2014-2016 Range Networks, Inc.
44
#
55
# This program is free software: you can redistribute it and/or modify
66
# it under the terms of the GNU Affero General Public License as published by
@@ -31,6 +31,10 @@ installIfMissing () {
3131
if [ $? -ne 0 ]; then
3232
echo "# - missing $@, installing dependency"
3333
sudo apt-get install $@ -y
34+
if [ $? -ne 0 ]; then
35+
echo "# - ERROR : $@ package was unable to be installed"
36+
exit 1
37+
fi
3438
fi
3539
}
3640

@@ -95,32 +99,6 @@ installIfMissing python-software-properties
9599
echo "# - done"
96100
echo
97101

98-
if ! stat -t /etc/apt/sources.list.d/*zeromq* >/dev/null 2>&1
99-
then
100-
echo "# adding modern zeromq repository"
101-
sudo add-apt-repository -y ppa:chris-lea/zeromq
102-
echo "# - done"
103-
echo
104-
echo "# updating repositories"
105-
sudo apt-get update
106-
echo "# - done"
107-
echo
108-
fi
109-
110-
if [ "$MANUFACTURER" == "Ettus" ]; then
111-
if ! stat -t /etc/apt/sources.list.d/*ettus* >/dev/null 2>&1
112-
then
113-
echo "# adding ettus repository"
114-
sudo bash -c 'echo "deb http://files.ettus.com/binaries/uhd_stable/repo/uhd/ubuntu/`lsb_release -cs` `lsb_release -cs` main" > /etc/apt/sources.list.d/ettus.list'
115-
echo "# - done"
116-
echo
117-
echo "# updating repositories"
118-
sudo apt-get update
119-
echo "# - done"
120-
echo
121-
fi
122-
fi
123-
124102
echo "# checking build dependencies"
125103
installIfMissing autoconf
126104
installIfMissing automake
@@ -131,7 +109,7 @@ installIfMissing libsqlite3-dev
131109
installIfMissing libusb-1.0-0
132110
installIfMissing libusb-1.0-0-dev
133111
installIfMissing libortp-dev
134-
installIfMissing libortp8
112+
installIfMissing libortp9
135113
installIfMissing libosip2-dev
136114
installIfMissing libreadline-dev
137115
installIfMissing libncurses5
@@ -147,13 +125,17 @@ installIfMissing libssl-dev
147125
installIfMissing libsrtp0
148126
installIfMissing libsrtp0-dev
149127
installIfMissing libsqliteodbc
150-
# modern zmq
128+
installIfMissing uuid-dev
129+
installIfMissing libjansson-dev
130+
installIfMissing libxml2-dev
131+
# zmq
151132
installIfMissing libzmq3-dev
152-
installIfMissing libzmq3
133+
installIfMissing libzmq5
153134
installIfMissing python-zmq
154135
if [ "$MANUFACTURER" == "Ettus" ]; then
155-
#sudo apt-get install -t `lsb_release -cs` uhd
156-
installIfMissing uhd
136+
installIfMissing libuhd-dev
137+
installIfMissing libuhd003
138+
installIfMissing uhd-host
157139
fi
158140
echo "# - done"
159141
echo
@@ -174,7 +156,7 @@ if [ "$COMPONENT" == "all" ] || [ "$COMPONENT" == "libcoredumper" ]; then
174156
fi
175157

176158
if [ "$COMPONENT" == "all" ] || [ "$COMPONENT" == "liba53" ]; then
177-
echo "# liba53 - building Debian and installing as dependency"
159+
echo "# liba53 - building Debian package and installing as dependency"
178160
sayAndDo cd liba53
179161
sayAndDo dpkg-buildpackage -us -uc
180162
sayAndDo cd ..

0 commit comments

Comments
 (0)