From 101674379d0e04a7d375da9179d758950eb7a38c Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Tue, 24 Aug 2021 19:23:08 +0200 Subject: [PATCH] Added support for ubuntu 18.04 --- .github/workflows/build_all.yml | 23 +++++++++++++++++++ docker_builds/ubuntu_bionic/Dockerfile | 4 ++++ docker_builds/ubuntu_bionic/do_build.sh | 30 +++++++++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 docker_builds/ubuntu_bionic/Dockerfile create mode 100644 docker_builds/ubuntu_bionic/do_build.sh diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 6570de8a..aae5425e 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -155,6 +155,28 @@ jobs: name: sdrpp_debian_sid_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + build_ubuntu_bionic: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_bionic && docker build . --tag sdrpp_build + + - name: Run Container + run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh + + - name: Recover Deb Archive + working-directory: ${{runner.workspace}} + run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./ + + - name: Save Deb Archive + uses: actions/upload-artifact@v2 + with: + name: sdrpp_ubuntu_bionic_amd64 + path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + build_ubuntu_focal: runs-on: ubuntu-latest @@ -237,6 +259,7 @@ jobs: mv sdrpp_debian_buster_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_buster_amd64.deb && mv sdrpp_debian_bullseye_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bullseye_amd64.deb && mv sdrpp_debian_sid_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb && + mv sdrpp_ubuntu_bionic_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_bionic_amd64.deb && mv sdrpp_ubuntu_focal_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb && mv sdrpp_ubuntu_groovy_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_groovy_amd64.deb && mv sdrpp_ubuntu_hirsute_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_hirsute_amd64.deb diff --git a/docker_builds/ubuntu_bionic/Dockerfile b/docker_builds/ubuntu_bionic/Dockerfile new file mode 100644 index 00000000..d4928b91 --- /dev/null +++ b/docker_builds/ubuntu_bionic/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:bionic +ENV DEBIAN_FRONTEND=noninteractive +COPY do_build.sh /root +RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh new file mode 100644 index 00000000..644120e8 --- /dev/null +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -0,0 +1,30 @@ +#!/bin/bash +set -e +cd /root + +# Update repos to get a more recent cmake version +apt update +apt install -y gpg wget +wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null +echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ bionic main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null +apt update + +# Install dependencies and tools +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev \ + libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget portaudio19-dev + +# Install SDRPlay libraries +wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1 +cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so +cp inc/* /usr/include/ + +cd SDRPlusPlus +mkdir build +cd build +cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_BLADERF_SOURCE=OFF -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON -DOPT_OVERRIDE_STD_FILESYSTEM=ON +make -j2 + +cd .. +sh make_debian_package.sh ./build libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev \ No newline at end of file