Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Qt 5.12.9 #95

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
docker create
MoJo2600 committed Jan 24, 2021
commit 26c212eb2da61fd3da09c45e14ace4d2cca2256e
4 changes: 2 additions & 2 deletions docker/rpi3/qt5.12.9/Dockerfile
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ RUN apt-get update -q && apt-get install -yq --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

# Clone Qtrpi and additional scripts
RUN git clone https://github.com:MoJo2600/qtrpi.git -b docker-compatibility
RUN git clone https://github.com/MoJo2600/qtrpi.git -b 5.12.9

# Setup Qtrpi environment
ENV QTRPI_QT_VERSION='5.12.9' \
QTRPI_TARGET_DEVICE='linux-rasp-rpi3-g++' \
QTRPI_TARGET_DEVICE='linux-rasp-pi3-g++' \
QTRPI_TARGET_HOST='pi@localhost' \
QTRPI_DOCKER='True'

2 changes: 1 addition & 1 deletion utils/common.sh
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ validate_var_qtrpi_target_device() {
NAME=$(device_name $QTRPI_TARGET_DEVICE)

if [[ ! $NAME ]]; then
exit_error "Invalid QTRPI_TARGET_DEVICE value ($QTRPI_TARGET_DEVICE). Supported values: \n- linux-rasp-pi-g++ \n- linux-rasp-pi2-g++ \n- linux-rasp-rpi3-g++"
exit_error "Invalid QTRPI_TARGET_DEVICE value ($QTRPI_TARGET_DEVICE). Supported values: \n- linux-rasp-pi-g++ \n- linux-rasp-pi2-g++ \n- linux-rasp-pi3-g++"
fi
}

4 changes: 2 additions & 2 deletions utils/synchronize-toolchain.sh
Original file line number Diff line number Diff line change
@@ -52,8 +52,8 @@ message 'Downloading Raspberry Pi toolchain'
function download_toolchain() {
# Download and unzip the latest raspbian image (~1.4Go zipped)
message "Downloading linaro ${LINARO_RELEASE}"
wget --content-disposition \
https://releases.linaro.org/components/toolchain/binaries/latest-7/arm-linux-gnueabihf/${LINARO_RELEASE}.tar.xz
curl https://releases.linaro.org/components/toolchain/binaries/latest-7/arm-linux-gnueabihf/${LINARO_RELEASE}.tar.xz \
-o ${LINARO_RELEASE}.tar.xz
tar xfv ${LINARO_RELEASE}.tar.xz
}