<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/22219">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">OBS: add_depend_deb: no self-dependencies<br><br>Check if we are trying to make a package depend on itself, and skip in<br>that case. This happens for the osmocom-nightly etc. metapackages, as<br>they go through the same code path as regular packages. While at it, use<br>proper variable names in the function.<br><br>Add the new variable as second argument and not as third, because a<br>fourth argument will be added with the dependency version, and because<br>this order will be consistent with osmo_obs_add_rpm_spec() when it gets<br>extended in a future commit.<br><br>Fix the following warning:<br>W: osmocom-nightly source: package-depends-on-itself osmocom-nightly depends<br><br>Related: OS#4733<br>Change-Id: I439079c00259d73a18cb8617a3e76d05df5a7a35<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, 15 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/19/22219/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 1566def..47f3f3d 100644</span><br><span>--- a/scripts/common-obs.sh</span><br><span>+++ b/scripts/common-obs.sh</span><br><span>@@ -18,13 +18,23 @@</span><br><span> </span><br><span> # Add dependency to all (sub)packages in debian/control and commit the change.</span><br><span> # $1: path to debian/control file</span><br><span style="color: hsl(0, 100%, 40%);">-# $2: name of the package to depend on</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> osmo_obs_add_depend_deb() {</span><br><span style="color: hsl(120, 100%, 40%);">+ local d_control="$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> # Note: adding the comma at the end should be fine. If there is a Depends: line, it is most likely not empty. It</span><br><span> # should at least have ${misc:Depends} according to lintian.</span><br><span style="color: hsl(0, 100%, 40%);">- sed "s/^Depends: /Depends: $2, /g" -i "$1"</span><br><span style="color: hsl(120, 100%, 40%);">+ sed "s/^Depends: /Depends: $depend, /g" -i "$d_control"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- git -C "$(dirname "$1")" commit -m "auto-commit: debian: depend on $2" .</span><br><span style="color: hsl(120, 100%, 40%);">+ git -C "$(dirname "$d_control")" commit -m "auto-commit: debian: depend on $depend" .</span><br><span> }</span><br><span> </span><br><span> # Copy a project's rpm spec.in file to the osc package dir, set the version/source and 'osc add' it</span><br><span>diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh</span><br><span>index 271824f..2689e35 100755</span><br><span>--- a/scripts/osmocom-latest-packages.sh</span><br><span>+++ b/scripts/osmocom-latest-packages.sh</span><br><span>@@ -73,7 +73,7 @@</span><br><span> ./git-version-gen . > .tarball-version 2>/dev/null</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_add_depend_deb "./debian/control" "osmocom-latest"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_depend_deb "./debian/control" "$project" "osmocom-latest"</span><br><span> </span><br><span> if [ "$project" = "open5gs" ]; then</span><br><span> # we cannot control the output directory of the generated source :(</span><br><span>diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh</span><br><span>index 4234021..3f95d17 100755</span><br><span>--- a/scripts/osmocom-nightly-packages.sh</span><br><span>+++ b/scripts/osmocom-nightly-packages.sh</span><br><span>@@ -129,7 +129,7 @@</span><br><span> </span><br><span> if [ "$changelog" = "commit" ] ; then</span><br><span> VER=$(get_commit_version)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_obs_add_depend_deb "./debian/control" "osmocom-$FEED"</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_obs_add_depend_deb "./debian/control" "$name" "osmocom-$FEED"</span><br><span> dch -b -v "$VER" -m "Snapshot build"</span><br><span> git commit -m "$VER snapshot" debian/</span><br><span> fi</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/22219">change 22219</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/+/22219"/><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: I439079c00259d73a18cb8617a3e76d05df5a7a35 </div>
<div style="display:none"> Gerrit-Change-Number: 22219 </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>