Change in ...libosmocore[master]: osmo-release.sh: Support releasing openbsc.git

[pespin]

pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/15127 )

Change subject: osmo-release.sh: Support releasing openbsc.git
......................................................................

osmo-release.sh: Support releasing openbsc.git

openbsc's directory structure is a bit different (has most stuff inside
an extra subdir). Let's account for that.

Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8
---
M osmo-release.sh
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved



diff --git a/osmo-release.sh b/osmo-release.sh
index a779a26..1effe7e 100755
--- a/osmo-release.sh
+++ b/osmo-release.sh
@@ -24,7 +24,12 @@
 # Make sure that depedency requirement versions match in configure.ac vs debian/control.
 #eg: "PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)" vs "libosmocore-dev (>= 1.0.0),"
 check_configureac_debctrl_deps_match() {
-	configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/configure.ac" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g")
+	if [ -f "${GIT_TOPDIR}/openbsc/configure.ac" ]; then
+		configureac_file="openbsc/configure.ac"
+	else
+		configureac_file="configure.ac"
+	fi
+	configureac_list=$(grep -e "PKG_CHECK_MODULES" "${GIT_TOPDIR}/${configureac_file}" | cut -d "," -f 2 | tr -d ")" | tr -d " " | sed "s/>=/ /g")
 	echo "$configureac_list" | \
 	{ return_error=0
 	while read -r dep ver; do
@@ -163,7 +168,7 @@
 fi
 gbp dch --debian-tag='%(version)s' --auto --meta --git-author --multimaint-merge --ignore-branch --new-version="$NEW_VER"
 dch -r -m --distribution "unstable" ""
-git add debian/changelog
+git add ${GIT_TOPDIR}/debian/changelog
 bumpversion --current-version $VERSION $REL --tag --commit --tag-name $NEW_VER --allow-dirty
 git commit --amend # let the user add extra information to the release commit.
 git tag -s $NEW_VER -f -m "Release v$NEW_VER on $ISODATE."

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/15127
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I407cf47d8339d99c74a976460ea84fffe679dfd8
Gerrit-Change-Number: 15127
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-CC: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190812/8f133700/attachment.htm>