Merge remote-tracking branch 'origin/develop' into scex-additions

scripts/create-sw-update.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+cmake --build . -j
+source create-version-file.sh
+
+if [ ! -f eive-obsw-stripped ]; then
+	echo "No file eive-obsw-stripped found. Please ensure you are in the "
+	echo "build folder and the OBSW was built properly"
+	exit 1
+fi
+
+if [ ! -f obsw_version.txt ]; then
+	echo "No OBSW version file found."
+	echo "You can use the create-version-file.sh script to create it"
+	exit 1
+fi
+
+mkdir update-archive
+cp eive-obsw-stripped update-archive
+cp obsw_version.txt update-archive
+
+cd update-archive
+
+sudo chown root:root eive-obsw-stripped
+sudo chown root:root obsw_version.txt
+
+cmd="tar -cJvf eive-sw-update.tar.xz eive-obsw-stripped obsw_version.txt"
+echo "Running command ${cmd} to generate compressed SW update archive."
+eval ${cmd}
+cp eive-sw-update.tar.xz ..
+cd ..
+rm -rf update-archive
+
+echo "Generated eive-sw-update.tar.xz update archive."

scripts/create-version-file.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+obsw_version_filename="obsw_version.txt"
+version_cmd="git describe --tags --always --exclude docker_*"
+version_tag=$(${version_cmd})
+echo "-I- Running ${version_cmd} to retrieve OBSW version and store it into ${obsw_version_filename}"
+echo "-I- Detected version tag ${version_tag}"
+echo ${version_tag} > ${obsw_version_filename}

scripts/q7s-cp.py

@@ -97,10 +97,12 @@ def build_cmd(args):
             target = f"/tmp"
         else:
             target = args.target
+    # accepted_key_rsa_args = "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
+    accepted_key_rsa_args = ""
     if args.invert:
-        cmd += f"{port_args} {address}:{args.source} {target}"
+        cmd += f"{port_args} {accepted_key_rsa_args} {address}:{args.source} {target}"
     else:
-        cmd += f"{port_args} {args.source} {address}:{target}"
+        cmd += f"{port_args} {accepted_key_rsa_args} {args.source} {address}:{target}"
     return cmd
 
 

scripts/q7s-env-em.sh

@@ -1,23 +0,0 @@
-#!/bin/bash -i
-# This script is intended to be copied outside of the source directory on the
-# same folder level as the eive-obsw folder. This allows to tweak it to
-# custom cross-compiler and sysroot path setups
-
-# Adapt the following two entries to your need
-CROSS_COMPILE_BIN_PATH="/opt/q7s-gcc/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
-export ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
-
-export PATH=$PATH:${CROSS_COMPILE_BIN_PATH}
-export CROSS_COMPILE="arm-linux-gnueabihf"
-export EIVE_Q7S_EM=1
-
-if [[ -d "eive-obsw" ]]; then
-	echo "Detected EIVE OBSW root directory at $(pwd)/eive-obsw. Setting to EIVE_OBSW_ROOT"
-	export EIVE_OBSW_ROOT="$(pwd)/eive-obsw"
-	echo "Adding $(pwd)/eive-obsw/cmake/scripts/q7s helper script path to PATH"
-	export PATH=$PATH:"$(pwd)/eive-obsw/cmake/scripts/q7s"
-	export PATH=$PATH:"$(pwd)/eive-obsw/scripts"
-	cd "eive-obsw"
-fi
-export CONSOLE_PREFIX="[Q7S ENV]"
-/bin/bash

scripts/q7s-env.sh

@@ -1,23 +0,0 @@
-#!/bin/bash -i
-# This script is intended to be copied outside of the source directory on the
-# same folder level as the eive-obsw folder. This allows to tweak it to
-# custom cross-compiler and sysroot path setups
-
-# Adapt the following two entries to your need
-CROSS_COMPILE_BIN_PATH="/opt/q7s-gcc/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
-export ZYNQ_7020_SYSROOT="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi"
-
-export PATH=$PATH:${CROSS_COMPILE_BIN_PATH}
-export CROSS_COMPILE="arm-linux-gnueabihf"
-# export EIVE_Q7S_EM=1
-
-if [[ -d "eive-obsw" ]]; then
-	echo "Detected EIVE OBSW root directory at $(pwd)/eive-obsw. Setting to EIVE_OBSW_ROOT"
-	export EIVE_OBSW_ROOT="$(pwd)/eive-obsw"
-	echo "Adding $(pwd)/eive-obsw/cmake/scripts/q7s helper script path to PATH"
-	export PATH=$PATH:"$(pwd)/eive-obsw/cmake/scripts/q7s"
-	export PATH=$PATH:"$(pwd)/eive-obsw/scripts"
-	cd "eive-obsw"
-fi
-export CONSOLE_PREFIX="[Q7S ENV]"
-/bin/bash