Commit 2c4d6f0c authored by Sami Nurmenniemi's avatar Sami Nurmenniemi

Installation succeeds now

parent e7efcf48
Pipeline #1160 failed with stages
......@@ -5,66 +5,65 @@ ARG USERID=1000
WORKDIR /home/builder
# Enable armhf packages
# - sources.list enables source and armhf repositories
RUN dpkg --add-architecture armhf
# Modified sources.list to enable armhf + deb-src
ADD target_files/sources.list /etc/apt/sources.list
# Enable deb-src packages
RUN apt-get update
RUN apt-get upgrade -y
# Install required packages. See https://wiki.qt.io/Building_Qt_5_from_Git
RUN apt-get install -y \
crossbuild-essential-armhf \
libxcb-xinerama0-dev:armhf \
freetds-dev:armhf \
libasound2-dev:armhf \
libdbus-1-dev:armhf \
libegl1-mesa-dev:armhf \
libgles2-mesa-dev:armhf \
libgstreamer1.0-dev:armhf \
libgstreamer-plugins-base1.0-dev:armhf \
libglu1-mesa-dev:armhf \
libharfbuzz-dev:armhf \
libicu-dev:armhf \
libjpeg-dev:armhf \
libmysqlclient-dev:armhf \
libpng16-dev:armhf \
libpq-dev:armhf \
libsqlite3-dev:armhf \
libssl-dev:armhf \
libx11-xcb-dev:armhf \
libglu1-mesa-dev:armhf \
libxrender-dev:armhf \
libxcb-xinerama0-dev:armhf \
libxi-dev:armhf \
libjpeg-dev:armhf \
libxrender-dev:armhf \
binutils \
bison \
bzip2 \
flex \
gcc \
g++ \
gdb \
unzip \
git \
pax \
pkg-config \
python \
python2.7-dev \
git \
flex \
texinfo \
xz-utils \
bzip2 \
bison \
pkg-config
RUN apt-get install -y libasound2-dev:armhf libgstreamer1.0-dev:armhf libgstreamer-plugins-base1.0-dev:armhf
RUN apt-get install -y libpng16-dev:armhf libharfbuzz-dev:armhf libssl-dev:armhf
RUN apt-get install -y libdbus-1-dev:armhf
RUN apt-get install -y libegl1-mesa-dev:armhf libgles2-mesa-dev:armhf
RUN apt-get install -y libmysqlclient-dev:armhf
RUN apt-get install -y libsqlite3-dev:armhf freetds-dev:armhf
RUN apt-get install -y libpq-dev:armhf
unzip \
xz-utils
RUN apt-get clean
#RUN apt-get build-dep -a armhf qt5-default -y
# Default user
# Create the build user
RUN useradd -u $USERID builder
# Add files needed for building and change their ownership
ADD /target_files/configure_artik_qt5.sh /home/builder
ADD /target_files/build_artik_qt5.sh /home/builder
#RUN mkdir -p /home/builder/patches/qtquickcontrols2
#ADD patches/qtquickcontrols2/0001-Fix-build-with-no-feature-shortcut.patch /home/builder/patches/qtquickcontrols2
RUN chown -R builder:builder /home/builder
#RUN chmod 700 /home/builder/.ssh
# Change to correct user and build dir. Build must be exposed from the
# host system
USER builder
WORKDIR /home/builder/build
# Default command, explicit command should be used for building
CMD /home/builder/build_artik_qt5.sh
......@@ -2,7 +2,7 @@
set -eu
function print_usage() {
echo "./docker_exec.sh \"configure|build\""
echo "./docker_exec.sh \"configure|build|debug|debugroot\""
}
if [ $# -ne 1 ]
......
......@@ -7,8 +7,8 @@ echo "Configure qt5 for Artik 530"
mkdir -p qt5-build
cd qt5-build
MAKEFLAGS="-j4" ../qt5/configure -confirm-license \
-hostprefix "$INSTALLDIR" \
-extprefix "$TARGETDIR" \
-extprefix "$INSTALLDIR" \
-prefix "$TARGETDIR" \
-sysroot "/" \
-device linux-arm-generic-g++ \
-device-option CROSS_COMPILE=arm-linux-gnueabihf- \
......@@ -40,4 +40,7 @@ MAKEFLAGS="-j4" ../qt5/configure -confirm-license \
-compile-examples \
-no-directfb \
-gstreamer 1.0 \
-no-sql-ibase -opengl es2
-no-sql-ibase \
-nomake examples \
-nomake tools \
-opengl es2
......@@ -3,14 +3,12 @@
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ xenial main restricted
deb [arch=armhf] http://ports.ubuntu.com/ xenial main restricted
deb-src http://archive.ubuntu.com/ubuntu/ xenial main universe restricted multiverse
#deb-src http://ports.ubuntu.com/ xenial main restricted
## Major bug fix updates produced after the final release of the
## distribution.
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted
deb [arch=armhf] http://ports.ubuntu.com/ xenial-updates main restricted
deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main universe restricted multiverse
#deb-src http://ports.ubuntu.com/ xenial-updates main restricted
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team. Also, please note that software in universe WILL NOT receive any
......@@ -18,11 +16,9 @@ deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main universe restricte
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ xenial universe
deb [arch=armhf] http://ports.ubuntu.com/ xenial universe
#deb-src http://archive.ubuntu.com/ubuntu/ xenial universe
#deb-src http://ports.ubuntu.com/ xenial universe
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ xenial-updates universe
deb [arch=armhf] http://ports.ubuntu.com/ xenial-updates universe
#deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates universe
#deb-src http://ports.ubuntu.com/ xenial-updates universe
## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
## team, and may not be under a free licence. Please satisfy yourself as to
......@@ -32,11 +28,9 @@ deb [arch=armhf] http://ports.ubuntu.com/ xenial-updates universe
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ xenial multiverse
deb [arch=armhf] http://ports.ubuntu.com/ xenial multiverse
#deb-src http://archive.ubuntu.com/ubuntu/ xenial multiverse
#deb-src http://ports.ubuntu.com/ xenial multiverse
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ xenial-updates multiverse
deb [arch=armhf] http://ports.ubuntu.com/ xenial-updates multiverse
#deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates multiverse
#deb-src http://ports.ubuntu.com/ xenial-updates multiverse
## N.B. software from this repository may not have been tested as
## extensively as that contained in the main release, although it includes
......@@ -46,7 +40,6 @@ deb [arch=armhf] http://ports.ubuntu.com/ xenial-updates multiverse
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
deb [arch=armhf] http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
#deb-src http://ports.ubuntu.com/ xenial-backports main restricted universe multiverse
## Uncomment the following two lines to add software from Canonical's
## 'partner' repository.
......@@ -54,17 +47,14 @@ deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted unive
## respective vendors as a service to Ubuntu users.
# deb http://archive.canonical.com/ubuntu xenial partner
# deb-src http://archive.canonical.com/ubuntu xenial partner
# deb-src http://ports.canonical.com/ xenial partner
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu/ xenial-security main restricted
deb [arch=armhf] http://ports.ubuntu.com/ xenial-security main restricted
deb-src http://security.ubuntu.com/ubuntu/ xenial-security main universe restricted multiverse
#deb-src http://ports.ubuntu.com/ xenial-security main restricted
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu/ xenial-security universe
deb [arch=armhf] http://ports.ubuntu.com/ xenial-security universe
#deb-src http://security.ubuntu.com/ubuntu/ xenial-security universe
#deb-src http://ports.ubuntu.com/ xenial-security universe
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu/ xenial-security multiverse
deb [arch=armhf] http://ports.ubuntu.com/ xenial-security multiverse
#deb-src http://security.ubuntu.com/ubuntu/ xenial-security multiverse
#deb-src http://ports.ubuntu.com/ xenial-security multiverse
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment