From 2ef19d24d25066e8cba53188c082842bb6d7176d Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 8 Feb 2023 13:36:55 +0100 Subject: release-tarball: fix osmo-trx 1.5.0 Run configure with the --with-mstrx argument, so LIBTRXCON_DIR is not pointing at an empty directory. Fix for: make[2]: Entering directory '/build/_temp/repos/osmo-trx/osmocom-bb' make[2]: *** No rule to make target 'distdir'. Stop. Change-Id: I2f067409f98119d4e35cf86cc2c816fc3c19e3f5 --- .../osmocom-release-tarballs.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/release-tarball-build-dist/osmocom-release-tarballs.sh b/release-tarball-build-dist/osmocom-release-tarballs.sh index f2bc599..6ab905f 100644 --- a/release-tarball-build-dist/osmocom-release-tarballs.sh +++ b/release-tarball-build-dist/osmocom-release-tarballs.sh @@ -156,6 +156,23 @@ prepare_depends() { esac } +# Run ./configure, with arguments if needed. +# $1: Osmocom repository +run_configure() { + case "$1" in + osmo-trx) + # Avoid pointing LIBTRXCON_DIR to an empty directory: + # https://gerrit.osmocom.org/c/osmo-trx/+/30792 + if grep -q with_mstrx configure.ac; then + ./configure --with-mstrx + fi + ;; + *) + ./configure + ;; + esac +} + # Apply workarounds for bugs that break too many releases. This function runs between ./configure and make dist-bzip2. # $1: Osmocom repository fix_repo() { @@ -243,7 +260,7 @@ create_tarball() { cd "$TEMP/repos/$repo" autoreconf -fi - ./configure + run_configure "$repo" fix_repo "$repo" make dist-bzip2 -- cgit v1.2.3