Fix armel/armhf combo problem

Author: JakubVanek

Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
                         sh "docker logout"
                     } catch (err) {}
                 }
-                sh "docker build -t ev3dev-lang-java:jdk-stretch -f system/Dockerfile system "
+                sh "docker build -t ev3dev-lang-java:jdk-stretch -f system/Dockerfile." + DOCKER_ARCH + " system "
             }
         }
         stage("Build cross-compilation environment") {

README.md

@@ -25,9 +25,9 @@ The output consists of these parts:
 1. Install [Docker](https://docs.docker.com/engine/installation/) for your operating system.
 2. Build the jdk cross-compilation OS:
 ```sh
-sudo docker build -t ev3dev-lang-java:jdk-stretch -f system/Dockerfile  system
+sudo docker build -t ev3dev-lang-java:jdk-stretch -f system/Dockerfile.armel  system # ONLY FOR EV3
+sudo docker build -t ev3dev-lang-java:jdk-stretch -f system/Dockerfile.armhf  system # ONLY FOR RPI1. RPI2 & RPI3
 ```
-
 3. Build the jdk cross-compilation environment:
 ```sh
 sudo docker build -t ev3dev-lang-java:jdk-build   -f scripts/Dockerfile scripts

system/Dockerfile system/Dockerfile.armel

@@ -5,14 +5,14 @@ FROM debian:stretch
 # setup repositories and install required packages
 COPY apt.sources.list.debian /etc/apt/sources.list
 COPY ev3dev-archive-keyring.gpg /etc/apt/trusted.gpg.d/
-RUN dpkg --add-architecture armel && dpkg --add-architecture armhf && \
+RUN dpkg --add-architecture armel && \
     apt-get -q update && \
     DEBIAN_FRONTEND=noninteractive apt-get -q install --yes --no-install-recommends \
         bash-completion \
         ca-certificates \
         cmake \
         build-essential \
-        crossbuild-essential-armel crossbuild-essential-armhf \
+        crossbuild-essential-armel \
         gdb-multiarch \
         less \
         man-db \
@@ -24,16 +24,16 @@ RUN dpkg --add-architecture armel && dpkg --add-architecture armhf && \
         vim \
         wget \
         xz-utils \
-        libcups2-dev:armel       libcups2-dev:armhf       \
-        libfreetype6-dev:armel   libfreetype6-dev:armhf   \
-        libfontconfig1-dev:armel libfontconfig1-dev:armhf \
-        libasound2-dev:armel     libasound2-dev:armhf     \
-        libx11-dev:armel         libx11-dev:armhf         \
-        libxext-dev:armel        libxext-dev:armhf        \
-        libxrender-dev:armel     libxrender-dev:armhf     \
-        libxtst-dev:armel        libxtst-dev:armhf        \
-        libxt-dev:armel          libxt-dev:armhf          \
-        libffi-dev:armel         libffi-dev:armhf         \
+        libcups2-dev:armel       \
+        libfreetype6-dev:armel   \
+        libfontconfig1-dev:armel \
+        libasound2-dev:armel     \
+        libx11-dev:armel         \
+        libxext-dev:armel        \
+        libxrender-dev:armel     \
+        libxtst-dev:armel        \
+        libxt-dev:armel          \
+        libffi-dev:armel         \
         curl \
         make \
         m4 \

system/Dockerfile.armhf

@@ -0,0 +1,58 @@
+FROM debian:stretch
+
+# this is a customized version of ev3dev-stretch-cross image
+
+# setup repositories and install required packages
+COPY apt.sources.list.debian /etc/apt/sources.list
+COPY ev3dev-archive-keyring.gpg /etc/apt/trusted.gpg.d/
+RUN dpkg --add-architecture armhf && \
+    apt-get -q update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -q install --yes --no-install-recommends \
+        bash-completion \
+        ca-certificates \
+        cmake \
+        build-essential \
+        crossbuild-essential-armhf \
+        gdb-multiarch \
+        less \
+        man-db \
+        nano \
+        pkg-config \
+        qemu-user-static \
+        sudo \
+        tree \
+        vim \
+        wget \
+        xz-utils \
+        libcups2-dev:armhf       \
+        libfreetype6-dev:armhf   \
+        libfontconfig1-dev:armhf \
+        libasound2-dev:armhf     \
+        libx11-dev:armhf         \
+        libxext-dev:armhf        \
+        libxrender-dev:armhf     \
+        libxtst-dev:armhf        \
+        libxt-dev:armhf          \
+        libffi-dev:armhf         \
+        curl \
+        make \
+        m4 \
+        cpio \
+        gawk \
+        file \
+        zip \
+        pigz \
+        unzip \
+        procps \
+        autoconf \
+        autoconf-archive \
+        automake \
+        autotools-dev \
+        mercurial \
+        zlib1g-dev
+
+# prepare a nonroot user
+COPY compiler.sudoers /etc/sudoers.d/compiler
+RUN chmod 0440 /etc/sudoers.d/compiler && \
+    adduser --disabled-password --gecos \"\" compiler && \
+    usermod -a -G sudo compiler