diff --git a/.github/dockerfile/Dockerfile b/.github/dockerfile/Dockerfile index d31f32bf..c002f475 100644 --- a/.github/dockerfile/Dockerfile +++ b/.github/dockerfile/Dockerfile @@ -17,7 +17,7 @@ RUN echo "Building cmake (v3.18.5)" \ && cd .. \ && cmake --version -RUN ./install-libs.sh -a -s x86_64 +RUN ./install-libs.sh -a RUN ./install-libs.sh -a -c -p aarch64-linux-gnu -s aarch64 RUN ./install-libs.sh -a -c -p arm-linux-gnueabihf -s armv4 diff --git a/install-libs.sh b/install-libs.sh index edbd20dd..9cc5251c 100755 --- a/install-libs.sh +++ b/install-libs.sh @@ -124,9 +124,9 @@ function build_jwt() { # MQTT-C function build_MQTT-C() { - echo "Building MQTT-C (1.1.5)" + echo "Building MQTT-C (neugates/main)" if [ ! -d MQTT-C ]; then - git clone -b 1.1.5 ${git_url_prefix}neugates/MQTT-C.git + git clone ${git_url_prefix}neugates/MQTT-C.git fi cd MQTT-C rm -rf build @@ -311,7 +311,7 @@ if [ $is_cross == "TRUE" ]; then -DCMAKE_STAGING_PREFIX=${install_dir} -DCMAKE_PREFIX_PATH=${install_dir}" install_opt="-DCMAKE_INSTALL_PREFIX=${install_dir}" ssl_lib_flag="-DOPENSSL_ROOT_DIR=${install_dir}/openssl \ - -DOPENSSL_INCLUDE_DIR==${install_dir}/openssl/include \ + -DOPENSSL_INCLUDE_DIR=${install_dir}/openssl/include \ -DOPENSSL_LIBRARIES='${install_dir}/openssl/lib/libssl.so ${install_dir}/openssl/lib/libcrypto.so'" echo "Entering $externs"