build(fixes): Corrections to the Arduino MQTT builds.

- Made targetenv.sh output better errors for when 'apps' repo isn't checked
  out at RELEASE-PRODUCTION
- Tweaked regression test script to output more tail, and the log file name.
- Fix to build failures on the Auduino MQTT stack due to missing dependencies.
- Added an export to the Arm64 tookchain.mk to allow pkg-config to find the
  AArch64 library configurations during cross-compilation

Author: Steve Revill

SystemTests/CI/regression_test-published-only.sh

@@ -100,8 +100,8 @@ function display_target {
 }
 
 function display_log_tail {
-    echo ">>>>>> START LOG TAIL >>>>>>"
-    tail -n 15 $1
+    echo ">>>>>> START LOG TAIL ($1) >>>>>>"
+    tail -n 20 $1
     echo "<<<<<< END LOG TAIL <<<<<<"
 }
 

target/Component-HAL/mqtt/arduino/mqtt.mk

@@ -1,3 +1,5 @@
+# Include Arduino MQTT library source
+VPATH += /home/inxware/Arduino/libraries/ArduinoMqttClient/src
 
-
-OBJECTS += mqtt.$(OBJ)
+OBJECTS += mqtt.$(OBJ)
+OBJECTS += MqttClient.$(OBJ)

target/envbuildscripts/targetenv.sh

@@ -128,13 +128,30 @@ echo "${TXT_FG_GREY}------------------------------------------------------------
 echo
 echo "Installing the default app"
 
-if [ "${EHS_SKIP_REPO_PULL}" = "" ]; then
+if [ -z "${EHS_SKIP_REPO_PULL}" ]; then
     echo "Checking out the latest PRODUCTION branch of your app repo..."
     if [ -d ../apps ]; then
-        pushd ../apps
-        warn "About to git pull in '$(pwd)'"
-        git pull origin RELEASE-PRODUCTION || exit 1
-        popd
+        pushd ../apps || exit 1
+
+        # Ensure we are on the right branch
+        if ! git rev-parse --abbrev-ref HEAD | grep -qx "RELEASE-PRODUCTION"; then
+            err "../apps is on branch '$(git rev-parse --abbrev-ref HEAD)'," >&2
+            err "but the build expects RELEASE-PRODUCTION. Please switch branches or set EHS_SKIP_REPO_PULL=1." >&2
+            exit 1
+        fi
+
+        # Refuse to pull if it would require a merge
+        git fetch origin RELEASE-PRODUCTION || exit 1
+        if ! git merge-base --is-ancestor HEAD origin/RELEASE-PRODUCTION; then
+            err "local RELEASE-PRODUCTION has diverged from origin/RELEASE-PRODUCTION." >&2
+            echo "Please run 'git reset --hard origin/RELEASE-PRODUCTION' or push your changes," >&2
+            echo "or set EHS_SKIP_REPO_PULL=1 to use your local state." >&2
+            exit 1
+        fi
+
+        git pull --ff-only origin RELEASE-PRODUCTION || exit 1
+
+        popd || exit 1
     else
         pushd ..
         if [ -f ${LOCAL_BASE}/COMMUNITY_RELEASE ]; then

target/os-arch/arduino_ALL/target.mk

@@ -70,5 +70,8 @@ LIB += misc
 
 
 #TODO2025  - Move to the component HAL
+# Include Arduino LSM6DS3 library source
+VPATH += /home/inxware/Arduino/libraries/Arduino_LSM6DS3/src
 OBJECTS += target_accel_gyro.$(OBJ)
+OBJECTS += LSM6DS3.$(OBJ)
 OBJECTS += target_display.$(OBJ)

target/os-arch/linux-arm64/toolchain.mk

@@ -29,7 +29,9 @@ ifeq ($(EHS_TOOLCHAIN_TYPE),clang)
 	LIB_DIRS+=/lib/aarch64-linux-gnu/
 	LNKFLAGS+= --target=aarch64-linux-gnu
 	CFLAGS+= -v --target=aarch64-linux-gnu
-	CPPFLAGS+= -v --target=aarch64-linux-gnu 
+	CPPFLAGS+= -v --target=aarch64-linux-gnu
+	# Set PKG_CONFIG_PATH for cross-compilation to find ARM64 libraries
+	export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
 endif
 # We need the maths lib - todo2-022, why not just have these as LIB+=m?
 LIB+=m