[CES-3162] Remove lingering references to EGLFS

- Remove unused dependecies from debian control file
- Update the qt config file "ultimaker-linux-imx8-g++" to properly compile without EGLFS.
- Remove unused packages from sysroot

Author: alexborro

.gitignore

@@ -2,7 +2,6 @@ Makefile
 .qmake.cache
 .qmake.super
 *.pro.user*
-tools/sysroot
 _build*
 .idea
-tools/ccache
+*.deb

build.sh

@@ -4,7 +4,7 @@
 set -eu
 
 ARCH="${ARCH:-arm64}" # armhf or x86_64 or amr64
-UM_ARCH="${UM_ARCH:-imx8m}" # Empty string, or sun7i for R1, or imx6dl for R2, or imx8m for colorado
+UM_ARCH="${UM_ARCH:-imx8}" # Empty string, or sun7i for R1, or imx6dl for R2, or imx8m for colorado
 
 SRC_DIR="$(pwd)"
 BUILD_DIR_TEMPLATE="_build"
@@ -84,7 +84,7 @@ build()
         -ccache \
         -v \
         -platform linux-g++-64 \
-        -device ultimaker-linux-imx8m-eglfs-g++ \
+        -device ultimaker-linux-imx8-g++ \
         -device-option CROSS_COMPILE="${CROSS_COMPILE}" \
         -sysroot "${SYSROOT}" \
         -extprefix "${TARGET_DIR}/qt" \

build_for_ultimaker.sh

@@ -73,7 +73,6 @@ usage()
     echo "       for testing a new Dockerfile release"    
     echo "  -l   Skip running the shellcheck linter"
     echo "  -h   Print usage"
-    echo "  -t   Skip tests"    
     echo
     echo "Other options will be passed on to build.sh"
     echo "Run './build.sh -h' for more information."

debian/control.in

@@ -6,4 +6,4 @@ Section: graphics
 Priority: optional
 Homepage: https://www.qt.io/
 Description: Qt is a free and open-source widget toolkit for creating graphical user interfaces.
-Depends: python3-sip,libxcb-dri3-0,libwayland-server0,libxcb-dri2-0,libxext6,libx11-xcb1,libxcb-xfixes0,libxcb-present0,libxcb-sync1,libxshmfence1,libwayland-client0,libfontconfig1
+Depends: libgles2,python3-sip,libxext6,libfontconfig1

patches/qtbase/0003-Add-imx8-makespecs-software-rendering-and-eglfs.patch

@@ -20,54 +20,34 @@ new file mode 100644
 index 00000000..8c22f71c
 --- /dev/null
 +++ b/mkspecs/devices/ultimaker-linux-imx8-g++/qmake.conf
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,29 @@
 +#
-+# qmake configuration for linux-g++ (Ultimaker Olimex specific)
++# qmake configuration for the Freescale iMX8 boards (single, dual and quad)
++#
++# Below is an example configure line that assumes the SDK is in
++# $HOME/imx6/toolchain. On device Qt is expected to be placed under
++# /usr/local/qt5 whereas on the host 'make install' will copy the host tools and
++# the target libraries to $HOME/imx6/qt5.
++#
++# ./configure -prefix /usr/local/qt5 -extprefix $HOME/imx6/qt5 -device linux-imx6-g++ \
++#   -device-option CROSS_COMPILE=$HOME/imx6/toolchain/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- \
++#   -sysroot $HOME/imx6/toolchain/sysroots/cortexa9hf-vfp-neon-poky-linux-gnueabi \
++#   -nomake examples -nomake tests -v
 +#
 +
 +include(../common/linux_device_pre.conf)
 +
-+MAKEFILE_GENERATOR      = UNIX
-+CONFIG                 += incremental optimize_full
-+QMAKE_INCREMENTAL_STYLE = sublib
-+
-+include(../../common/linux.conf)
-+include(../../common/gcc-base-unix.conf)
-+include(../../common/g++-unix.conf)
-+
-+!load(device_config) {
-+  error(Could not successfully load device configuration)
-+}
-+
-+# modifications to g++-unix.conf
-+QMAKE_CC                = $${CROSS_COMPILE}gcc
-+QMAKE_CXX               = $${CROSS_COMPILE}g++
-+QMAKE_LINK              = $${QMAKE_CXX}
-+QMAKE_LINK_SHLIB        = $${QMAKE_CXX}
-+
-+# modifications to linux.conf
-+QMAKE_AR                = $${CROSS_COMPILE}ar cqs
-+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
-+QMAKE_NM                = $${CROSS_COMPILE}nm -P
-+QMAKE_STRIP             = $${CROSS_COMPILE}strip
-+
-+# modifications to gcc-base.conf
-+QMAKE_AR_LTCG           = $${CROSS_COMPILE}gcc-ar cqs
-+QMAKE_NM_LTCG           = $${CROSS_COMPILE}gcc-nm -P
-+
-+contains(DISTRO_OPTS, deb-multi-arch): \
-+QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config
-+
-+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
-+
-+#include(../common/linux_arm_device_post.conf)
-+contains(DISTRO_OPTS, hard-float) {
-+  COMPILER_FLAGS += -mfloat-abi=hard
-+  LINKER_FLAGS   += -mfloat-abi=hard
-+} else: !contains(DISTRO_OPTS, aarch64) {
-+  COMPILER_FLAGS += -mfloat-abi=softfp
-+  LINKER_FLAGS   += -mfloat-abi=softfp
-+}
++QMAKE_LIBS_OPENGL_ES2  += -lGLESv2 -lEGL -lGAL
++QMAKE_LIBS_OPENVG      += -lOpenVG -lEGL -lGAL
++
++IMX8_CFLAGS             = -march=armv8-a -DLINUX=1 -DEGL_API_FB=1
++QMAKE_CFLAGS           += $$IMX8_CFLAGS
++QMAKE_CXXFLAGS         += $$IMX8_CFLAGS
++
++DISTRO_OPTS += aarch64
++
++
++include(../common/linux_arm_device_post.conf)
 +
 +load(qt_config)
 \ No newline at end of file

tools/sysroot_multistrap.cfg

@@ -6,12 +6,17 @@ explicitsuite=true
 aptsources=Debian
 bootstrap=Debian DebianStable
 
+# When 'true', multistrap will *not* download packages that are 'Priority: required', otherwise it will override
+# those specific package versions from your recipe file.
+# Set this value to 'false' if you intend to use wildcard values in your recipe.
+omitrequired=true
+
 [DebianStable]
 packages=libgles-dev  
-packages=perl pkg-config libudev-dev debconf zlib1g-dev libxkbcommon-dev libpng-dev
+packages=perl pkg-config debconf libxkbcommon-dev
 packages=python3-dev python3-sip-dev libssl-dev
 source=http://ftp.debian.org/debian
 suite=bookworm
 components=main non-free
-
+omitdebsrc=true