From fa300742ea3480281a9865493826ba7b9d8cd1a9 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Sat, 8 Feb 2025 13:51:42 -0700 Subject: [PATCH] Fix build (#16393) * Fix rpi build * Attempt to fix jetson builds --- docker/main/build_nginx.sh | 11 +++++++++-- docker/main/build_sqlite_vec.sh | 10 +++++++++- docker/rpi/install_deps.sh | 3 ++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/docker/main/build_nginx.sh b/docker/main/build_nginx.sh index 505b19071..2591810e3 100755 --- a/docker/main/build_nginx.sh +++ b/docker/main/build_nginx.sh @@ -8,9 +8,16 @@ SECURE_TOKEN_MODULE_VERSION="1.5" SET_MISC_MODULE_VERSION="v0.33" NGX_DEVEL_KIT_VERSION="v0.3.3" -sed -i '/^Types:/s/deb/& deb-src/' /etc/apt/sources.list.d/debian.sources -apt-get update +source /etc/os-release +if [[ "$VERSION_ID" == "12" ]]; then + sed -i '/^Types:/s/deb/& deb-src/' /etc/apt/sources.list.d/debian.sources +else + cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list + sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list +fi + +apt-get update apt-get -yqq build-dep nginx apt-get -yqq install --no-install-recommends ca-certificates wget diff --git a/docker/main/build_sqlite_vec.sh b/docker/main/build_sqlite_vec.sh index 4893a0db1..b41f3383d 100755 --- a/docker/main/build_sqlite_vec.sh +++ b/docker/main/build_sqlite_vec.sh @@ -4,7 +4,15 @@ set -euxo pipefail SQLITE_VEC_VERSION="0.1.3" -sed -i '/^Types:/s/deb/& deb-src/' /etc/apt/sources.list.d/debian.sources +source /etc/os-release + +if [[ "$VERSION_ID" == "12" ]]; then + sed -i '/^Types:/s/deb/& deb-src/' /etc/apt/sources.list.d/debian.sources +else + cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list + sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list +fi + apt-get update apt-get -yqq build-dep sqlite3 gettext git diff --git a/docker/rpi/install_deps.sh b/docker/rpi/install_deps.sh index 76da198fc..ed34389e5 100755 --- a/docker/rpi/install_deps.sh +++ b/docker/rpi/install_deps.sh @@ -18,7 +18,8 @@ apt-get -qq install --no-install-recommends -y \ mkdir -p -m 600 /root/.gnupg # enable non-free repo -sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list +echo "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" | tee -a /etc/apt/sources.list +apt update # ffmpeg -> arm64 if [[ "${TARGETARCH}" == "arm64" ]]; then