Use new armv4, armv5, armv6hf, armv7hf containers to build the corresponding binaries

Signed-off-by: DL6ER <[email protected]>

Author: DL6ER

.circleci/config.yml

@@ -3,17 +3,12 @@ version: 2
 .job_steps: &job_steps
   steps:
     - checkout
-    - run:
-        name: "Setup"
-        command: |
-          if [[ $CIRCLE_JOB == *"qemu"* ]] ; then sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset ; fi
     - run:
         name: "Build"
         no_output_timeout: 30m
         command: |
           BRANCH=$([ -z "$CIRCLE_TAG" ] && echo "$CIRCLE_BRANCH" || echo "master")
-          [[ $CIRCLE_JOB == *"qemu"* ]] && DOCKERIFNEEDED="docker run --rm -v $(pwd):/workspace -w /workspace pihole/ftl-build:v1.5-arm-qemu "
-          $DOCKERIFNEEDED bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}"
+          bash .circleci/build-CI.sh "${STATIC}" "${BRANCH}" "${CIRCLE_TAG}" "${CIRCLE_JOB}"
     - run:
         name: "Binary checks"
         command: bash test/arch_test.sh
@@ -36,19 +31,29 @@ version: 2
 
 .docker_template: &docker_template
   docker:
-    - image: pihole/ftl-build:v1.5-$CIRCLE_JOB
+    - image: pihole/ftl-build:v1.6-$CIRCLE_JOB
   <<: *job_steps
 
 jobs:
-  arm:
+  armv4t:
     <<: *docker_template
     environment:
-      BIN_NAME: "pihole-FTL-arm-linux-gnueabi"
+      BIN_NAME: "pihole-FTL-armv4-linux-gnueabi"
 
-  armhf:
+  armv5te:
     <<: *docker_template
     environment:
-      BIN_NAME: "pihole-FTL-arm-linux-gnueabihf"
+      BIN_NAME: "pihole-FTL-armv5-linux-gnueabi"
+
+  armv6hf:
+    <<: *docker_template
+    environment:
+      BIN_NAME: "pihole-FTL-armv6-linux-gnueabihf"
+
+  armv7hf:
+    <<: *docker_template
+    environment:
+      BIN_NAME: "pihole-FTL-armv7-linux-gnueabihf"
 
   aarch64:
     <<: *docker_template
@@ -70,26 +75,23 @@ jobs:
     environment:
       BIN_NAME: "pihole-FTL-linux-x86_32"
 
-  arm-qemu:
-    machine:
-      enabled: true
-    environment:
-      BIN_NAME: "pihole-FTL-armel-native"
-    <<: *job_steps
-
 workflows:
   version: 2
   build:
     jobs:
-      - arm:
+      - armv4t:
+          filters:
+            tags:
+              only: /^v.*/
+      - armv5te:
           filters:
             tags:
               only: /^v.*/
-      - arm-qemu:
+      - armv6hf:
           filters:
             tags:
               only: /^v.*/
-      - armhf:
+      - armv7hf:
           filters:
             tags:
               only: /^v.*/

test/arch_test.sh

@@ -88,7 +88,25 @@ elif [[ "${CIRCLE_JOB}" == "aarch64" ]]; then
   check_libs "[librt.so.1] [libpthread.so.0] [libc.so.6] [ld-linux-aarch64.so.1]"
   check_file "ELF 64-bit LSB shared object, ARM aarch64, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-aarch64.so.1, for GNU/Linux 3.7.0, not stripped"
 
-elif [[ "${CIRCLE_JOB}" == "arm" ]]; then
+elif [[ "${CIRCLE_JOB}" == "armv4t" ]]; then
+
+  check_machine "ELF32" "ARM"
+  check_libs "[librt.so.1] [libgcc_s.so.1] [libpthread.so.0] [libc.so.6] [ld-linux.so.3]"
+  check_file "ELF 32-bit LSB shared object, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux.so.3, for GNU/Linux 3.2.0, not stripped"
+
+  check_CPU_arch "v4T"
+  check_FP_arch "" # No specified FP arch
+
+elif [[ "${CIRCLE_JOB}" == "armv5te" ]]; then
+
+  check_machine "ELF32" "ARM"
+  check_libs "[librt.so.1] [libgcc_s.so.1] [libpthread.so.0] [libc.so.6] [ld-linux.so.3]"
+  check_file "ELF 32-bit LSB shared object, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux.so.3, for GNU/Linux 3.2.0, with debug_info, not stripped"
+
+  check_CPU_arch "v5TE"
+  check_FP_arch "" # No specified FP arch
+
+elif [[ "${CIRCLE_JOB}" == "armv6hf" ]]; then
 
   check_machine "ELF32" "ARM"
   check_libs "[librt.so.1] [libgcc_s.so.1] [libpthread.so.0] [libc.so.6] [ld-linux-armhf.so.3]"
@@ -97,7 +115,7 @@ elif [[ "${CIRCLE_JOB}" == "arm" ]]; then
   check_CPU_arch "v6"
   check_FP_arch "VFPv2"
 
-elif [[ "${CIRCLE_JOB}" == "armhf" ]]; then
+elif [[ "${CIRCLE_JOB}" == "armv7hf" ]]; then
 
   check_machine "ELF32" "ARM"
   check_libs "[librt.so.1] [libgcc_s.so.1] [libpthread.so.0] [libc.so.6] [ld-linux-armhf.so.3]"
@@ -106,18 +124,11 @@ elif [[ "${CIRCLE_JOB}" == "armhf" ]]; then
   check_CPU_arch "v7"
   check_FP_arch "VFPv3-D16"
 
-elif [[ "${CIRCLE_JOB}" == "arm-qemu" ]]; then
-
-  check_machine "ELF32" "ARM"
-  check_libs "[librt.so.1] [libgcc_s.so.1] [libpthread.so.0] [libc.so.6] [ld-linux.so.3]"
-  check_file "ELF 32-bit LSB  shared object, ARM, EABI5 version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 3.2.0, not stripped"
-
-  check_CPU_arch "v4T"
-  check_FP_arch "" # No specified FP arch
-
 else
+
   echo "Invalid job ${CIRCLE_JOB}"
   exit 1
+
 fi
 
 exit 0