<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22221">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: osmo_obs_add_rpm_spec: depend on conflict pkg<br><br>Related: OS#4733<br>Change-Id: I69bebdadaf89c2a6e5dd9a27161703a567882359<br>---<br>M scripts/common-obs.sh<br>M scripts/osmocom-latest-packages.sh<br>M scripts/osmocom-nightly-packages.sh<br>3 files changed, 42 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/21/22221/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 0655370..adfa076 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -37,14 +37,49 @@</span><br><span> git -C "$(dirname "$d_control")" commit -m "auto-commit: debian: depend on $depend" .</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Copy a project's rpm spec.in file to the osc package dir, set the version/source and 'osc add' it</span><br><span style="color: hsl(120, 100%, 40%);">+# Add dependency to all (sub)packages in rpm spec file</span><br><span style="color: hsl(120, 100%, 40%);">+# $1: path to rpm spec file</span><br><span style="color: hsl(120, 100%, 40%);">+# $2: package name (e.g. "libosmocore")</span><br><span style="color: hsl(120, 100%, 40%);">+# $3: dependency package name (e.g. "osmocom-nightly")</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_obs_add_depend_rpm() {</span><br><span style="color: hsl(120, 100%, 40%);">+ local spec="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ local pkgname="$2"</span><br><span style="color: hsl(120, 100%, 40%);">+ local depend="$3"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if [ "$pkgname" = "$depend" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "NOTE: skipping dependency on itself: $depend"</span><br><span style="color: hsl(120, 100%, 40%);">+ return</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%);">+ ( while IFS= read -r line; do</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "$line"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case "$line" in</span><br><span style="color: hsl(120, 100%, 40%);">+ # Main package</span><br><span style="color: hsl(120, 100%, 40%);">+ "Name:"*)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Requires: $depend"</span><br><span style="color: hsl(120, 100%, 40%);">+ ;;</span><br><span style="color: hsl(120, 100%, 40%);">+ # Subpackages</span><br><span style="color: hsl(120, 100%, 40%);">+ "%package"*)</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "Requires: $depend"</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%);">+ done < "$spec" ) > "$spec.new"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mv "$spec.new" "$spec"</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%);">+# Copy a project's rpm spec.in file to the osc package dir, set the version/source, depend on the conflicting dummy</span><br><span style="color: hsl(120, 100%, 40%);">+# package and 'osc add' it</span><br><span> # $1: oscdir (path to checked out OSC package)</span><br><span> # $2: repodir (path to git repository)</span><br><span style="color: hsl(0, 100%, 40%);">-# $3: name (e.g. libosmocore)</span><br><span style="color: hsl(120, 100%, 40%);">+# $3: package name (e.g. "libosmocore")</span><br><span style="color: hsl(120, 100%, 40%);">+# $4: dependency package name (e.g. "osmocom-nightly")</span><br><span> osmo_obs_add_rpm_spec() {</span><br><span> local oscdir="$1"</span><br><span> local repodir="$2"</span><br><span> local name="$3"</span><br><span style="color: hsl(120, 100%, 40%);">+ local depend="$4"</span><br><span> local spec_in="$(find "$repodir" -name "$name.spec.in")"</span><br><span> local spec="$oscdir/$name.spec"</span><br><span> local tarball</span><br><span>@@ -57,6 +92,8 @@</span><br><span> </span><br><span> cp "$spec_in" "$spec"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_depend_rpm "$spec" "$name" "$depend"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # Set version</span><br><span> version="$(grep "^Version: " "$oscdir"/*.dsc | cut -d: -f2 | xargs)"</span><br><span> sed -i "s/^Version:.*/Version: $version/g" "$spec"</span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index 2689e35..94fcf7a 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -96,7 +96,7 @@</span><br><span> mv "$output/"*.tar* "$TOP/$PROJ/$project/"</span><br><span> cd "$TOP/$PROJ"</span><br><span> osc add "$project"</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_add_rpm_spec "$TOP/$PROJ/$project" "$output" "$project"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_rpm_spec "$TOP/$PROJ/$project" "$output" "$project" "osmocom-latest"</span><br><span> else</span><br><span> cd "$TOP/$PROJ/$project"</span><br><span> </span><br><span>@@ -107,7 +107,7 @@</span><br><span> mv "$output/"*.dsc .</span><br><span> mv "$output/"*.tar* .</span><br><span> osc add ./*</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_add_rpm_spec "$PWD" "$output" "$project"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_rpm_spec "$PWD" "$output" "$project" "osmocom-latest"</span><br><span> fi</span><br><span> fi</span><br><span> cd "$TOP"</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index 3f95d17..ea181ab 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -152,7 +152,7 @@</span><br><span> </span><br><span> cd "$oscdir"</span><br><span> osc add -- *.tar* *.dsc</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_add_rpm_spec "$oscdir" "$repodir" "$name"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_rpm_spec "$oscdir" "$repodir" "$name" "osmocom-$FEED"</span><br><span> osc ci -m "Snapshot $name $DT" --noservice</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/+/22221">change 22221</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/+/22221"/><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: I69bebdadaf89c2a6e5dd9a27161703a567882359 </div>
<div style="display:none"> Gerrit-Change-Number: 22221 </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>