From 49c8c21061d39e65f620b542b6bd0e5391af16ea Mon Sep 17 00:00:00 2001 From: MinyazevR <89993880+MinyazevR@users.noreply.github.com> Date: Thu, 14 Nov 2024 14:30:21 +0300 Subject: [PATCH] Add --setopt=install_weak_deps=False on install packages (#1817) * Add --setopt=install_weak_deps=False on install packages * Adding sudo for possibility reuse --- buildScripts/github/install_Linux.sh | 12 ++++++------ buildScripts/github/install_installer_environment.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildScripts/github/install_Linux.sh b/buildScripts/github/install_Linux.sh index 8fbfd4cae5..d7484c0975 100755 --- a/buildScripts/github/install_Linux.sh +++ b/buildScripts/github/install_Linux.sh @@ -5,7 +5,7 @@ ID=$(grep '^ID=' /etc/os-release | cut -d'=' -f2) GCC_VERSION=${GCC_VERSION:-13} if [ "$ID" = "altlinux" ]; then - apt-get update && apt-get install -y gcc-c++ curl xz p7zip-standalone rsync libusb-devel \ + sudo apt-get update && sudo apt-get install -y gcc-c++ curl xz p7zip-standalone rsync libusb-devel \ libudev-devel libGL-devel libGLX-mesa python3-dev zlib-devel make ccache python3-module-pip time \ qt5-multimedia-devel qt5-svg-devel qt5-script-devel qt5-tools qt5-serialport-devel elif [ "$ID" = "ubuntu" ]; then @@ -13,12 +13,12 @@ elif [ "$ID" = "ubuntu" ]; then ccache curl libusb-1.0-0-dev make qtscript5-dev qttools5-dev-tools qtmultimedia5-dev libqt5serialport5-dev libqt5svg5-dev \ libudev-dev python3.${TRIK_PYTHON3_VERSION_MINOR}-dev qtbase5-private-dev qtwayland5 elif [[ "$ID" = "rocky" || "$ID" = '"rocky"' ]]; then - yum update -y && yum install -y epel-release - yum install --allowerasing -y sudo which libusbx-devel curl wget make gcc-toolset-"$GCC_VERSION"-{gcc-c++,libasan-devel,libubsan-devel,gdb} \ + sudo yum update -y && sudo yum install -y --setopt=install_weak_deps=False epel-release + sudo yum install --allowerasing -y --setopt=install_weak_deps=False sudo which libusbx-devel curl wget make gcc-toolset-"$GCC_VERSION"-{gcc-c++,libasan-devel,libubsan-devel,gdb} \ git-core ccache zlib-devel rsync python3.${TRIK_PYTHON3_VERSION_MINOR}-{devel,pip,urllib3} mesa-libGL-devel systemd-devel fontconfig p7zip xz time - yum install -y libxkbcommon-x11 qt5-qtbase-gui #no desire to enumerate all required libraries for QtIFw - yum install -y pulseaudio-libs-glib2 # to run TS and 2D-model even with `minimal` platform - yum install -y qt5-qtscript-devel qt5-qttools-devel qt5-qtmultimedia-devel qt5-qtserialport-devel qt5-qtsvg-devel qt5-qtbase-devel qt5-qtbase-private-devel \ + sudo yum install -y --setopt=install_weak_deps=False libxkbcommon-x11 qt5-qtbase-gui #no desire to enumerate all required libraries for QtIFw + sudo yum install -y --setopt=install_weak_deps=False pulseaudio-libs-glib2 # to run TS and 2D-model even with `minimal` platform + sudo yum install -y --setopt=install_weak_deps=False qt5-qtscript-devel qt5-qttools-devel qt5-qtmultimedia-devel qt5-qtserialport-devel qt5-qtsvg-devel qt5-qtbase-devel qt5-qtbase-private-devel \ qt5-qtwayland echo "source scl_source enable gcc-toolset-$GCC_VERSION" >> ~/.bash_profile fi diff --git a/buildScripts/github/install_installer_environment.sh b/buildScripts/github/install_installer_environment.sh index 047fb1464e..7f80bbeb8c 100755 --- a/buildScripts/github/install_installer_environment.sh +++ b/buildScripts/github/install_installer_environment.sh @@ -6,8 +6,8 @@ GCC_VERSION=${GCC_VERSION:-13} TRIK_PYTHON="python3.${TRIK_PYTHON3_VERSION_MINOR}" TRIK_QT_VERSION=${TRIK_QT_VERSION:-5.15} -sudo yum update -y && sudo yum install -y epel-release -sudo yum install --allowerasing -y --setopt=install_weak_deps=False sudo which libusbx-devel curl wget make gcc-toolset-"$GCC_VERSION"-{gcc-c++,libasan-devel,libubsan-devel,gdb} \ +sudo yum update -y && sudo yum install -y --setopt=install_weak_deps=False epel-release +sudo yum install --allowerasing -y --setopt=install_weak_deps=False which libusbx-devel curl wget make gcc-toolset-"$GCC_VERSION"-{gcc-c++,libasan-devel,libubsan-devel,gdb} \ git-core ccache zlib-devel rsync "$TRIK_PYTHON"-{devel,pip,urllib3} mesa-libGL-devel systemd-devel fontconfig p7zip xz time findutils sudo yum install -y --setopt=install_weak_deps=False pulseaudio-libs-glib2 qt5-qtbase-gui libwayland-{server,client,cursor} libxkbcommon-x11 echo "source scl_source enable gcc-toolset-$GCC_VERSION" >> ~/.bash_profile