From fe4cd2b5586f08be1faa008d50b1f6030c628d8d Mon Sep 17 00:00:00 2001 From: Bindea Cristian Date: Wed, 10 Apr 2024 14:18:14 +0300 Subject: [PATCH] test --- .github/workflows/kuiperbuild.yml | 3 +++ ci/kuiper/copy-deps.sh | 32 ++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/.github/workflows/kuiperbuild.yml b/.github/workflows/kuiperbuild.yml index 8072fa4bbc..3b87161dd9 100644 --- a/.github/workflows/kuiperbuild.yml +++ b/.github/workflows/kuiperbuild.yml @@ -31,6 +31,9 @@ jobs: shell: bash run: echo "commit_sha=$(git rev-parse --short ${{ github.sha }})" >> "$GITHUB_ENV" + - name: Setup upterm session + uses: lhotari/action-upterm@v1 + - uses: actions/upload-artifact@v4 with: name: scopy-linux-armhf-${{ env.commit_sha }} diff --git a/ci/kuiper/copy-deps.sh b/ci/kuiper/copy-deps.sh index 57a08ce14a..2311b3c39b 100755 --- a/ci/kuiper/copy-deps.sh +++ b/ci/kuiper/copy-deps.sh @@ -1,6 +1,8 @@ #!/bin/bash set -ex +export PS4='+(${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' + SRC_DIR=$(git rev-parse --show-toplevel) source $SRC_DIR/ci/kuiper/kuiper_build_config.sh @@ -12,23 +14,35 @@ if [ ! -f "${SRC_DIR}"/ci/kuiper/ldd-mod ]; then ls /usr/arm-linux-gnueabihf/lib ls /usr/arm-linux-gnueabihf/lib/ld-2.31.so ls /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 + printenv sed 's|.*RTLDLIST=.*|RTLDLIST="/usr/arm-linux-gnueabihf/lib/ld-2.31.so /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3"|' /usr/bin/ldd | tee "${SRC_DIR}"/ci/kuiper/ldd-mod chmod +x "${SRC_DIR}"/ci/kuiper/ldd-mod + + + echo "-----------------" + cat "${SRC_DIR}"/ci/kuiper/ldd-mod fi export LD_LIBRARY_PATH="${APP_DIR}/usr/lib:${SYSROOT}/lib:${SYSROOT}/lib/arm-linux-gnueabihf:${SYSROOT}/usr/arm-linux-gnueabihf/lib:${SYSROOT}/usr/local/qt5.15/lib:${SYSROOT}/usr/local/lib:${SRC_DIR}/build" LIBS_ARRAY=() run_ldd(){ - if [ ! -z "$(${SRC_DIR}/ci/kuiper/ldd-mod $1 | grep "not found")" ]; then - echo "--- LIB NOT FOUND" - ${SRC_DIR}/ci/kuiper/ldd-mod $1 - exit 1 - fi - if [ ! -z "$(${SRC_DIR}/ci/kuiper/ldd-mod $1 | grep "not a dynamic executable")" ]; then - echo "--- LDD ERROR" - exit 1 - fi + # if [ ! -z "$(${SRC_DIR}/ci/kuiper/ldd-mod $1 | grep "not found")" ]; then + # echo "--- LIB NOT FOUND" + # ${SRC_DIR}/ci/kuiper/ldd-mod $1 + # exit 1 + # fi + # if [ ! -z "$(${SRC_DIR}/ci/kuiper/ldd-mod $1 | grep "dynamic executable")" ]; then + # echo "--- LDD ERROR" + # exit 1 + # fi + + echo "LDD test:" + ldd "$1" + + echo "LDD-mod test:" + "${SRC_DIR}"/ci/kuiper/ldd-mod "$1" + for library in $("${SRC_DIR}"/ci/kuiper/ldd-mod "$1" | cut -d '>' -f 2 | awk '{print $1}') do