commit 686964d80198c3cb172552958b9963143f1ea9d6
author Ash Wilson <ash.d.wilson@gmail.com> Sat Feb 20 10:03:40 2016 -0800
committer Ash Wilson <ash.d.wilson@gmail.com> Sat Feb 20 10:03:40 2016 -0800
tree 7b43f2006938370e8e72e51bc0e970f67f6c3e59
parent 2e719b174a81f2cccb14377ef22e7ea09c1d3d51

Committing ubu14 to travis branch

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 836e4c5..e69de29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,72 +0,0 @@
-FROM ubuntu:14.04
-
-ENV GRGSM_GIT=https://github.com/ptrkrysik/gr-gsm
-ENV OSMOCORE_GIT=git://git.osmocom.org/libosmocore.git
-ENV GR_OSMOSDR_GIT=git://git.osmocom.org/gr-osmosdr
-
-# We know it's going to foul up, so we run this install separately and then ...fix... dpkg status
-RUN apt-get update && apt-get install -y uhd-host || \
-     sed -i "s/Status: install ok half-configured/Status: install ok installed/g" /var/lib/dpkg/status
-
-RUN apt-get update && apt-get install -y \
-    git \
-    vim \
-    gnuradio-dev \
-    gr-osmosdr \
-    libgnuradio-osmosdr0.0.0 \
-    libosmosdr-dev \
-    libosmosdr0 \
-    osmo-sdr \
-    cmake \
-    autoconf \
-    libtool \
-    python-talloc-dev \
-    libtalloc2 \
-    libtalloc-dev \
-    libpcsclite-dev \
-    build-essential \
-    libboost-all-dev \
-    libcppunit-dev swig \
-    doxygen \
-    liblog4cpp5-dev \
-    python-scipy \
-    librtlsdr-dev \
-    librtlsdr0 \
-    rtl-sdr \
-    wget
-
-
-RUN /usr/bin/git clone $OSMOCORE_GIT && \
-  cd libosmocore && \
-  autoreconf -i && \
-  ./configure && \
-  make && \
-  make install && \
-  ldconfig -i
-
-#RUN /usr/bin/git clone $GR_OSMOSDR_GIT && \
-#  cd gr-osmosdr && \
-#  mkdir build && \
-#  cd build && \
-#  cmake .. && \
-#  make && \
-#  make install && \
-#  ldconfig
-
-#RUN /usr/bin/git clone $GRGSM_GIT && \
-#  cd gr-gsm && \
-#  mkdir build && \
-#  cd build && \
-#  cmake .. && \
-#  make && \
-#  sudo make install &&\
-#  ldconfig
-
-COPY ./ /src/
-RUN ls /src
-RUN mkdir /src/build && \
-    cd /src/build && \
-    cmake .. && \
-    make && \
-    make install && \
-    ldconfig

Ubuntu14.docker

diff --git a/Ubuntu14.docker b/Ubuntu14.docker
index 836e4c5..a7a7648 100644
--- a/Ubuntu14.docker
+++ b/Ubuntu14.docker
@@ -33,7 +33,8 @@
     librtlsdr-dev \
     librtlsdr0 \
     rtl-sdr \
-    wget
+    wget \
+    libxi-dev
 
 
 RUN /usr/bin/git clone $OSMOCORE_GIT && \
@@ -44,23 +45,6 @@
   make install && \
   ldconfig -i
 
-#RUN /usr/bin/git clone $GR_OSMOSDR_GIT && \
-#  cd gr-osmosdr && \
-#  mkdir build && \
-#  cd build && \
-#  cmake .. && \
-#  make && \
-#  make install && \
-#  ldconfig
-
-#RUN /usr/bin/git clone $GRGSM_GIT && \
-#  cd gr-gsm && \
-#  mkdir build && \
-#  cd build && \
-#  cmake .. && \
-#  make && \
-#  sudo make install &&\
-#  ldconfig
 
 COPY ./ /src/
 RUN ls /src