diff --git a/linux/debian/essentials/postinst b/linux/debian/essentials/postinst index 29e13ad5c33f5706674a2a1b4bcfafbd972d7974..2e9f1710d17013b12a28c0203ce0e1d8de56487f 100755 --- a/linux/debian/essentials/postinst +++ b/linux/debian/essentials/postinst @@ -14,7 +14,7 @@ DAP_CFG="$DAP_PREFIX/etc/$DAP_APP_NAME.cfg" # Check profile.d symlink -[ -e "/etc/profile.d/$DAP_APP_NAME.sh" ] && ln -sf $DAP_PREFIX/share/profile.d/$DAP_APP_NAME.sh /etc/profile.d/$DAP_APP_NAME.sh +[ -e "/etc/profile.d/$DAP_APP_NAME.sh" ] || ln -sf $DAP_PREFIX/share/profile.d/$DAP_APP_NAME.sh /etc/profile.d/$DAP_APP_NAME.sh # Init node config if [ -e "$DAP_CFG" ]; then diff --git a/linux/debian/scripts/compile_and_pack.sh b/linux/debian/scripts/compile_and_pack.sh index 2b99ca467b9dbf99b574c1bbaad850b9dd46c679..5a5af9afdde4a2f5d96863e160c152359937adec 100755 --- a/linux/debian/scripts/compile_and_pack.sh +++ b/linux/debian/scripts/compile_and_pack.sh @@ -47,13 +47,17 @@ substitute_pkgname_postfix && mkdir -p build && cd build && cmake ../ && make -j && cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$? if [[ $(echo $ARCH_VERSIONS | grep arm64) != "" && $error == 0 ]]; then + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_ARM64 cmake -DCMAKE_C_COMPILER=$ARM64_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARM64_CXX_COMPILER -DCMAKE_TARGET_ARCH="arm64" .. && make -j$(nproc) && \ cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$? + unset LD_LIBRARY_PATH done if [[ $(echo $ARCH_VERSIONS | grep armhf) != "" && $error == 0 ]]; then + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_ARMHF cmake -DCMAKE_C_COMPILER=$ARMHF_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARMHF_CXX_COMPILER -DCMAKE_TARGET_ARCH="armhf" .. && make -j$(nproc) && \ cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$? + unset LD_LIBRARY_PATH done if [[ $(echo $BUILD_TYPE | grep PGSQL) != "" && $error == 0 ]]; then diff --git a/linux/debian/scripts/deploy.sh b/linux/debian/scripts/deploy.sh index 3fba115a66a7ce2881c9a9763c501ec1bdd78d4c..ab0bdfd2db2b0c9fe122367d25120738b718423d 100755 --- a/linux/debian/scripts/deploy.sh +++ b/linux/debian/scripts/deploy.sh @@ -35,12 +35,12 @@ for pkgfile in $PKGFILES; do scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/$pkgname_public$MOD.deb" if [[ $(echo $pkgname | grep "pgsql\|dbg") == "" ]]; then scp -r -i $CELLFRAME_REPO_KEY ../prod_build/general/essentials/$pkgname_weblink "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/" - fi - if [[ $CI_COMMIT_REF_NAME == "master" ]]; then -set -x - scp -P $REPO_PORT -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_REPO_CREDS:~/aptly/repo_update/$pkgname_public$MOD.deb" - ssh -p $REPO_PORT -i $CELLFRAME_REPO_KEY "$CELLFRAME_REPO_CREDS" -- "~/aptly/repo_update.sh" -set +x + if [[ $CI_COMMIT_REF_NAME == "master" ]]; then + set -x + scp -P $REPO_PORT -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_REPO_CREDS:~/aptly/repo_update/$pkgname_public$MOD.deb" + ssh -p $REPO_PORT -i $CELLFRAME_REPO_KEY "$CELLFRAME_REPO_CREDS" -- "~/aptly/repo_update.sh" + set +x + fi fi # ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "ln -sf $CELLFRAME_FILESERVER_PATH/$pkgname$MOD.deb $CELLFRAME_FILESERVER_PATH/$pkgname$MOD-latest.deb"