Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

Changes to allow Linux companion to be compiled with qt5.7 (#4262)

Browse source 
* Changes to allow Linux companion to be compiled with qt5.7

* Optimize
This commit is contained in:
3djc 2017-01-20 11:13:33 -08:00 • committed by Bertrand Songis
parent 0ff8ed35b9
commit cc205dcc91
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
radio/util/Dockerfile
View file

@ -1,6 +1,6 @@
# An Debian image for compiling OpenTX 2.2 # An Debian image for compiling OpenTX 2.2
FROM debian:jessie FROM ubuntu:16.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
@ -9,19 +9,21 @@ RUN apt-get update && \
cmake \ cmake \
gcc \ gcc \
git \ git \
libgtest-dev \
lib32ncurses5 \ lib32ncurses5 \
lib32z1 \ lib32z1 \
libfox-1.6-dev \ libfox-1.6-dev \
libsdl1.2-dev \ libsdl1.2-dev \
python-qt4 \ python-qt4 \
qt5-default \
qtmultimedia5-dev \
qttools5-dev \
qttools5-dev-tools \
software-properties-common \ software-properties-common \
wget \ wget \
zip zip
RUN add-apt-repository ppa:beineri/opt-qt571-xenial -y && \
apt-get update && \
apt-get install -qq qt57base qt57multimedia qt57tools && \
/opt/qt57/bin/qt57-env.sh
RUN wget -q https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \ RUN wget -q https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \
tar xjf gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \ tar xjf gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \
mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi
@ -37,4 +39,4 @@ VOLUME ["/opentx"]
ENV PATH $PATH:/opt/gcc-arm-none-eabi/bin:/opentx/code/radio/util ENV PATH $PATH:/opt/gcc-arm-none-eabi/bin:/opentx/code/radio/util
ARG OPENTX_VERSION_SUFFIX= ARG OPENTX_VERSION_SUFFIX=
ENV OPENTX_VERSION_SUFFIX ${OPENTX_VERSION_SUFFIX} ENV OPENTX_VERSION_SUFFIX ${OPENTX_VERSION_SUFFIX}
ENV CMAKE_PREFIX_PATH /opt/qt57

1
tools/nightly22/build-nightly.sh
View file

@ -57,4 +57,3 @@ cd $output/companion/macosx
wget -qO- http://opentx.blinkt.de:8080/~opentx/build-opentx.py?branch=${branch}\&suffix=${suffix} wget -qO- http://opentx.blinkt.de:8080/~opentx/build-opentx.py?branch=${branch}\&suffix=${suffix}
wget -O opentx-companion-${version}${suffix}.dmg http://opentx.blinkt.de:8080/~opentx/builds/opentx-companion-${version}${suffix}.dmg wget -O opentx-companion-${version}${suffix}.dmg http://opentx.blinkt.de:8080/~opentx/builds/opentx-companion-${version}${suffix}.dmg
chmod -Rf g+w opentx-companion-${version}${suffix}.dmg chmod -Rf g+w opentx-companion-${version}${suffix}.dmg