<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22922">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: nightly: use epoch from debian/changelog<br><br>If epoch is used in debian/changelog, prepend it to the version from<br>git-version-gen. Also set the epoch in the spec file.<br><br>For example, the version in debian/changelog may be 1:0.0.1. The epoch<br>is 1, therefore a 0.0.1.18.b5d18 version from git-version-gen would turn<br>into 1:0.0.1.18.b5d18.<br><br>Setting epoch=1 is needed for osmo-gbproxy, so apt on debian 10 with the<br>nightly Osmocom repository enabled does not try to install osmo-gbproxy<br>1.3.0 from the debian repositories instead of 0.0.1 from the Omsocom<br>repository.<br><br>Related: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version<br>Related: OS#4992<br>Change-Id: I3d63f040058340bdcf9075c03387798c5314be03<br>---<br>M scripts/common-obs.sh<br>M scripts/osmocom-nightly-packages.sh<br>2 files changed, 24 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/22922/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh</span><br><span>index 366d72e..edd48df 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -113,6 +113,7 @@</span><br><span> local spec="$oscdir/$name.spec"</span><br><span> local tarball</span><br><span> local version</span><br><span style="color: hsl(120, 100%, 40%);">+ local epoch</span><br><span> </span><br><span> if [ -z "$spec_in" ]; then</span><br><span> echo "WARNING: RPM spec missing: $name.spec.in"</span><br><span>@@ -123,9 +124,19 @@</span><br><span> </span><br><span> osmo_obs_add_depend_rpm "$spec" "$name" "$depend" "$dependver"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Set version</span><br><span style="color: hsl(0, 100%, 40%);">- version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2 | xargs)"</span><br><span style="color: hsl(0, 100%, 40%);">- sed -i "s/^Version:.*/Version: $version/g" "$spec"</span><br><span style="color: hsl(120, 100%, 40%);">+ # Set version and epoch from "Version: [EPOCH:]VERSION" in .dsc</span><br><span style="color: hsl(120, 100%, 40%);">+ version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2- | xargs)"</span><br><span style="color: hsl(120, 100%, 40%);">+ case $version in</span><br><span style="color: hsl(120, 100%, 40%);">+ *:*)</span><br><span style="color: hsl(120, 100%, 40%);">+ epoch=$(echo "$version" | cut -d : -f 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ version=$(echo "$version" | cut -d : -f 2)</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ -n "$epoch" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ sed -i "s/^Version:.*/Version: $version\nEpoch: $epoch/g" "$spec"</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ sed -i "s/^Version:.*/Version: $version/g" "$spec"</span><br><span style="color: hsl(120, 100%, 40%);">+ fi</span><br><span> </span><br><span> # Set source file</span><br><span> tarball="$(ls -1 "${name}_"*".tar."*)"</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index d8338ae..09d832a 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -70,11 +70,19 @@</span><br><span> version=$(echo "$version" | sed 's/-/./g' )</span><br><span> </span><br><span> # deb version</span><br><span style="color: hsl(120, 100%, 40%);">+ deb_version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,')</span><br><span> if [ -z "$version" ] || [ "$version" = "UNKNOWN" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- version=$(head -1 debian/changelog | cut -d ' ' -f 2 | sed 's,(,,' | sed 's,),,')</span><br><span style="color: hsl(0, 100%, 40%);">- version="$version.$DT"</span><br><span style="color: hsl(120, 100%, 40%);">+ version="$deb_version.$DT"</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ # add epoch from debian/changelog</span><br><span style="color: hsl(120, 100%, 40%);">+ case $deb_version in</span><br><span style="color: hsl(120, 100%, 40%);">+ *:*)</span><br><span style="color: hsl(120, 100%, 40%);">+ epoch=$(echo "$deb_version" | cut -d : -f 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ version=$epoch:$version</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ esac</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> echo -n "$version"</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22922">change 22922</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/osmo-ci/+/22922"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3d63f040058340bdcf9075c03387798c5314be03 </div>
<div style="display:none"> Gerrit-Change-Number: 22922 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>