Skip to content

Commit 05af0f9

Browse files
committed
get builder images working
1 parent e2b50db commit 05af0f9

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

.github/workflows/build-builder-images.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ jobs:
6868
# Install build dependencies
6969
RUN apt-get update && \
7070
apt-get install -y --no-install-recommends \
71-
apt-utils \
72-
&& apt-get install -y --no-install-recommends \
7371
build-essential \
7472
debhelper \
7573
cmake \
@@ -85,21 +83,25 @@ jobs:
8583
libairspyhf-dev \
8684
libhackrf-dev \
8785
libpthread-stubs0-dev \
88-
libc6-dev \
89-
linux-libc-dev \
9086
libudev-dev \
9187
tzdata \
9288
ca-certificates \
9389
&& rm -rf /var/lib/apt/lists/*
9490
95-
# Build and install RTL-SDR
91+
# Build and install RTL-SDR - Try with threads explicitly disabled first as workaround
9692
WORKDIR /tmp/build
9793
RUN git clone https://gitea.osmocom.org/sdr/rtl-sdr.git --depth 1 && \
9894
cd rtl-sdr && \
9995
mkdir build && cd build && \
100-
cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
101-
-DINSTALL_UDEV_RULES=ON \
102-
-DDETACH_KERNEL_DRIVER=ON && \
96+
(cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
97+
-DINSTALL_UDEV_RULES=OFF \
98+
-DDETACH_KERNEL_DRIVER=ON \
99+
-DCMAKE_THREAD_PREFER_PTHREAD=ON \
100+
-DTHREADS_PREFER_PTHREAD_FLAG=ON || \
101+
(echo "=== CMAKE FAILED - Dumping error logs ===" && \
102+
echo "=== CMakeError.log ===" && cat CMakeFiles/CMakeError.log && \
103+
echo "=== CMakeOutput.log ===" && cat CMakeFiles/CMakeOutput.log && \
104+
exit 1)) && \
103105
make -j$(nproc) && \
104106
make install && \
105107
ldconfig

0 commit comments

Comments
 (0)