osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40020?usp=email ) Change subject: osmo-ns-master: build without uring for debian 10 ...................................................................... osmo-ns-master: build without uring for debian 10 In preparation for running FR tests with debian 10, adjust osmo-ns-master to build libosmocore without uring support as liburing-dev is not packaged for debian 10. Related: OS#6494#note-19 Change-Id: I1278bc3435c791c429b38a21b53c8efe20e741df --- M osmo-ns-master/Dockerfile 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/osmo-ns-master/Dockerfile b/osmo-ns-master/Dockerfile index b5164a6..35e360d 100644 --- a/osmo-ns-master/Dockerfile +++ b/osmo-ns-master/Dockerfile @@ -25,12 +25,17 @@ RUN git clone https://gerrit.osmocom.org/libosmocore.git ADD https://gerrit.osmocom.org/plugins/gitiles/libosmocore/+/$LIBOSMOCORE_BRANCH... /tmp/commit-libosmocore -RUN cd libosmocore && \ +RUN set -x && \ + cd libosmocore && \ git fetch && git checkout $LIBOSMOCORE_BRANCH && \ (git symbolic-ref -q HEAD && git reset --hard origin/$LIBOSMOCORE_BRANCH || exit 1); \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ - ./configure --disable-doxygen --disable-pcsc --enable-external-tests && \ + CONFIGURE_FLAGS="--disable-doxygen --disable-pcsc --enable-external-tests" && \ + if [ "$DISTRO" = "debian-buster" ]; then \ + CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-uring"; \ + fi && \ + ./configure $CONFIGURE_FLAGS && \ make "-j$(nproc)" install && \ install -m 0755 utils/.libs/osmo-ns-dummy /usr/local/bin/osmo-ns-dummy && \ /sbin/ldconfig -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40020?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1278bc3435c791c429b38a21b53c8efe20e741df Gerrit-Change-Number: 40020 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de>