<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23090">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-release.sh: Check LIBVERSION matches rpm *.spec.in<br><br>Change-Id: I7b8d56cc255167407370c888647255d8992f4202<br>---<br>M osmo-release.sh<br>1 file changed, 81 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-release.sh b/osmo-release.sh</span><br><span>index ceb63b6..173652d 100755</span><br><span>--- a/osmo-release.sh</span><br><span>+++ b/osmo-release.sh</span><br><span>@@ -9,10 +9,11 @@</span><br><span> </span><br><span> ALLOW_NO_LIBVERSION_CHANGE="${ALLOW_NO_LIBVERSION_CHANGE:-0}"</span><br><span> ALLOW_NO_LIBVERSION_DEB_MATCH="${ALLOW_NO_LIBVERSION_DEB_MATCH:-0}"</span><br><span style="color: hsl(120, 100%, 40%);">+ALLOW_NO_LIBVERSION_RPM_MATCH="${ALLOW_NO_LIBVERSION_RPM_MATCH:-0}"</span><br><span> # Test stuff but don't modify stuff:</span><br><span> DRY_RUN="${DRY_RUN:-0}"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-libversion_to_deb_major() {</span><br><span style="color: hsl(120, 100%, 40%);">+libversion_to_lib_major() {</span><br><span> libversion="$1"</span><br><span> current="$(echo "$libversion" | cut -d ":" -f 1)"</span><br><span> #revision="$(echo "$libversion" | cut -d ":" -f 2)"</span><br><span>@@ -124,6 +125,81 @@</span><br><span> done</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+libversion_deb_match() {</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$LIBVERS" | while read -r line; do</span><br><span style="color: hsl(120, 100%, 40%);">+ libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]")</span><br><span style="color: hsl(120, 100%, 40%);">+ major="$(libversion_to_lib_major "$libversion")"</span><br><span style="color: hsl(120, 100%, 40%);">+ file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)"</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "z$file_matches" = "z0" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ elif [ "z$file_matches" = "z1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)"</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "z$control_matches" = "z0" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ elif [ "z$control_matches" = "z1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)"</span><br><span style="color: hsl(120, 100%, 40%);">+ dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)"</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "z$dhstrip_lib_total" != "z0" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "z$dhstrip_lib_matches" = "z0" ] ; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ elif [ "z$dhstrip_lib_total" = "z1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span style="color: hsl(120, 100%, 40%);">+ # catch and forward exit from pipe subshell "while read":</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ $? -ne 0 ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+libversion_rpmspecin_match() {</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$LIBVERS" | while read -r line; do</span><br><span style="color: hsl(120, 100%, 40%);">+ libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]")</span><br><span style="color: hsl(120, 100%, 40%);">+ major="$(libversion_to_lib_major "$libversion")"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ control_matches="$(grep -e "%files" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "lib" | grep "$major$" | wc -l)"</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "z$control_matches" = "z0" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: Found no matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ elif [ "z$control_matches" = "z1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "OK: Found '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "WARN: Found $file_matches files matching '%files -n lib*$major' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ control_matches="$(grep -e "_libdir" "${GIT_TOPDIR}/contrib/"*.spec.in | grep "/lib" | grep "so.$major" | wc -l)"</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "z$control_matches" = "z0" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: Found no matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ elif [ "z$control_matches" = "z1" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "OK: Found '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "WARN: Found $file_matches files matching '%_libdir/lib*.so.$major*' in contrib/*.spec.in for LIBVERSION=$libversion, manual check required!"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span style="color: hsl(120, 100%, 40%);">+ # catch and forward exit from pipe subshell "while read":</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ $? -ne 0 ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ exit 1</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> BUMPVER=`command -v bumpversion`</span><br><span> GIT_TOPDIR="$(git rev-parse --show-toplevel)"</span><br><span> NEW_VER=`bumpversion --list --current-version $VERSION $REL --allow-dirty | awk -F '=' '{ print $2 }'`</span><br><span>@@ -155,46 +231,10 @@</span><br><span> exit 1</span><br><span> fi</span><br><span> if [ "z$ALLOW_NO_LIBVERSION_DEB_MATCH" = "z0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "$LIBVERS" | while read -r line; do</span><br><span style="color: hsl(0, 100%, 40%);">- libversion=$(echo "$line" | cut -d "=" -f 2 | tr -d "[:space:]")</span><br><span style="color: hsl(0, 100%, 40%);">- major="$(libversion_to_deb_major "$libversion")"</span><br><span style="color: hsl(0, 100%, 40%);">- file_matches="$(find "${GIT_TOPDIR}/debian" -name "lib*${major}.install" | wc -l)"</span><br><span style="color: hsl(0, 100%, 40%);">- if [ "z$file_matches" = "z0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "ERROR: Found no matching debian/lib*$major.install file for LIBVERSION=$libversion"</span><br><span style="color: hsl(0, 100%, 40%);">- exit 1</span><br><span style="color: hsl(0, 100%, 40%);">- elif [ "z$file_matches" = "z1" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "OK: Found matching debian/lib*$major.install for LIBVERSION=$libversion"</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- echo "WARN: Found $file_matches files matching debian/lib*$major.install for LIBVERSION=$libversion, manual check required!"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- control_matches="$(grep -e "Package" "${GIT_TOPDIR}/debian/control" | grep "lib" | grep "$major$" | wc -l)"</span><br><span style="color: hsl(0, 100%, 40%);">- if [ "z$control_matches" = "z0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "ERROR: Found no matching Package lib*$major in debian/control for LIBVERSION=$libversion"</span><br><span style="color: hsl(0, 100%, 40%);">- exit 1</span><br><span style="color: hsl(0, 100%, 40%);">- elif [ "z$control_matches" = "z1" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "OK: Found 'Package: lib*$major' in debian/control for LIBVERSION=$libversion"</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- echo "WARN: Found $file_matches files matching 'Package: lib*$major' in debian/control for LIBVERSION=$libversion, manual check required!"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- dhstrip_lib_total="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | wc -l)"</span><br><span style="color: hsl(0, 100%, 40%);">- dhstrip_lib_matches="$(grep -e "dh_strip" "${GIT_TOPDIR}/debian/rules" | grep "\-plib" | grep "$major" | wc -l)"</span><br><span style="color: hsl(0, 100%, 40%);">- if [ "z$dhstrip_lib_total" != "z0" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- if [ "z$dhstrip_lib_matches" = "z0" ] ; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "ERROR: Found no matching 'dh_strip -plib*$major' line in debian/rules for LIBVERSION=$libversion"</span><br><span style="color: hsl(0, 100%, 40%);">- exit 1</span><br><span style="color: hsl(0, 100%, 40%);">- elif [ "z$dhstrip_lib_total" = "z1" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "OK: Found 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion"</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- echo "WARN: Found $dhstrip_lib_matches/$dhstrip_lib_total dh_strip matches 'dh_strip -plib*$major' in debian/rules for LIBVERSION=$libversion, manual check required!"</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">- done</span><br><span style="color: hsl(0, 100%, 40%);">- # catch and forward exit from pipe subshell "while read":</span><br><span style="color: hsl(0, 100%, 40%);">- if [ $? -ne 0 ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- exit 1</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(120, 100%, 40%);">+ libversion_deb_match</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "z$ALLOW_NO_LIBVERSION_RPM_MATCH" = "z0" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ libversion_rpmspecin_match</span><br><span> fi</span><br><span> fi</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23090">change 23090</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/23090"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7b8d56cc255167407370c888647255d8992f4202 </div>
<div style="display:none"> Gerrit-Change-Number: 23090 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>