diff --git a/ci/arm/arm_build_config.sh b/ci/arm/arm_build_config.sh index 8d5c2b5c4e..29374a8530 100644 --- a/ci/arm/arm_build_config.sh +++ b/ci/arm/arm_build_config.sh @@ -51,8 +51,6 @@ APP_SQUASHFS=$SRC_SCRIPT/scopy.squashfs # Runetimes downloaded from https://github.com/AppImage/AppImageKit/releases/continuous Mar 9, 2023 RUNTIME_ARM=$SRC_SCRIPT/runtime-${TOOLCHAIN_HOST%%-*} # remove everything after the first hyphen - - if [ $TOOLCHAIN_HOST == "aarch64-linux-gnu" ]; then CMAKE_SYSTEM_PROCESSOR=aarch64 CMAKE_LIBRARY_ARCHITECTURE=aarch64-linux-gnu diff --git a/ci/arm/inside_chroot_arm64.sh b/ci/arm/inside_chroot_arm64.sh index 992269a260..1e9372156e 100644 --- a/ci/arm/inside_chroot_arm64.sh +++ b/ci/arm/inside_chroot_arm64.sh @@ -19,7 +19,7 @@ apt -y dist-upgrade dpkg --configure -a apt -y install '^libxcb.*-dev' autoconf automake bison build-essential cmake dh-python figlet flex freeglut3-dev g++ gawk gcc \ - gdb-multiarch gdbserver git libavahi-client* libavahi-common* libboost1.81-all-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev \ + gdb-multiarch gdbserver git libavahi-client* libavahi-common* libboost1.81-all-dev libdrm-dev libgbm-dev libglib2.0-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev \ libgmp-dev libinput-dev libopenal-dev libsndfile1-dev libspeechd-dev libts-dev libudev-dev libunwind-dev libxcb-icccm4 libxcb-xinerama0 \ libx11-xcb-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libxrender-dev libxml2-dev libxml2-utils mesa-common-dev mesa-utils* \ perl pkg-config unzip wget || true diff --git a/ci/arm/inside_chroot_armhf.sh b/ci/arm/inside_chroot_armhf.sh index 6e199ad3ed..ecd8148f44 100644 --- a/ci/arm/inside_chroot_armhf.sh +++ b/ci/arm/inside_chroot_armhf.sh @@ -25,7 +25,7 @@ rm -rfv $(find / | grep gnuradio) apt -y build-dep qtbase5-dev || true apt -y install '^libxcb.*-dev' autoconf automake bison build-essential cmake figlet flex freeglut3-dev g++ gawk gcc \ - gdb-multiarch gdbserver git libavahi-client* libavahi-common* libboost1.81-all-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \ + gdb-multiarch gdbserver git libavahi-client* libavahi-common* libboost1.81-all-dev libdrm-dev libgbm-dev libglib2.0-dev libgl1-mesa-dev libgles2-mesa-dev \ libglu1-mesa-dev libgmp-dev libinput-dev libopenal-dev libsndfile1-dev libspeechd-dev libts-dev libudev-dev \ libunwind-dev libx11-xcb-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libxrender-dev libxml2-dev libxml2-utils \ mesa-common-dev mesa-utils* perl pkg-config python2 unzip wget || true