diff --git a/packaging/deps.sh b/packaging/deps.sh index 481124f2f..5d7f883b1 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -90,9 +90,9 @@ fi # Build & Install uldaq -if ! pkg-config "libuldaq >= 1.0.0" && \ +if ! pkg-config "libuldaq >= 1.2.0" && \ [ -z "${SKIP_ULDAQ}" ]; then - git clone --branch rpmbuild --depth 1 https://github.com/stv0g/uldaq + git clone --branch v1.2.0 --depth 1 https://github.com/mccdaq/uldaq pushd uldaq autoreconf -i ./configure --enable-examples=no ${CONFIGURE_OPTS} diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index 597642912..ea635dabf 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -66,6 +66,7 @@ RUN apt-get update && \ libcomedi-dev:${ARCH} \ libibverbs-dev:${ARCH} \ librdmacm-dev:${ARCH} \ + libusb-1.0-0-dev:${ARCH} \ libre-dev:${ARCH} \ liblua5.3-dev:${ARCH} \ libhiredis-dev:${ARCH} @@ -106,8 +107,7 @@ ENV TRIPLET=${TRIPLET} # Install unpackaged dependencies from source ADD packaging/deps.sh / -RUN export SKIP_ULDAQ=1; \ - bash deps.sh +RUN bash deps.sh # Expose ports for HTTP and WebSocket frontend EXPOSE 80