<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13413">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  osmith: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-build-dep.sh: cd into subdir before building<br><br>Support building the legacy openbsc source with osmo-build.dep.sh. This<br>will be used by the upcoming osmocom-build-old-tags-against-master.sh<br>script.<br><br>Related: OS#3765<br>Change-Id: I852e103e80bf295f692cf13c4cb38e80fbc19eca<br>---<br>M scripts/common.sh<br>M scripts/osmo-build-dep.sh<br>2 files changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/common.sh b/scripts/common.sh</span><br><span>index 9f274d7..0a32c31 100644</span><br><span>--- a/scripts/common.sh</span><br><span>+++ b/scripts/common.sh</span><br><span>@@ -59,3 +59,13 @@</span><br><span>      ret="$(osmo_git_last_commits_tags "$1" "$2" "$3")"</span><br><span>   echo "$ret" | cut -d/ -f 3</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Print the subdirectory of the repository where the source lies (configure.ac etc.).</span><br><span style="color: hsl(120, 100%, 40%);">+# Print nothing when the source is in the topdir of the repository.</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_source_subdir() {</span><br><span style="color: hsl(120, 100%, 40%);">+       case "$1" in</span><br><span style="color: hsl(120, 100%, 40%);">+                openbsc)</span><br><span style="color: hsl(120, 100%, 40%);">+                      echo "openbsc"</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>diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh</span><br><span>index dfec9be..2e4fb31 100755</span><br><span>--- a/scripts/osmo-build-dep.sh</span><br><span>+++ b/scripts/osmo-build-dep.sh</span><br><span>@@ -1,4 +1,5 @@</span><br><span> #!/bin/sh</span><br><span style="color: hsl(120, 100%, 40%);">+. "$(dirname "$0")/common.sh"</span><br><span> </span><br><span> project="$1"</span><br><span> branch="$2"</span><br><span>@@ -48,6 +49,11 @@</span><br><span> # of the -I and -L search paths</span><br><span> mkdir -p "$inst/stow"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+subdir="$(osmo_source_subdir "$project")"</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -n "$subdir" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+  cd "$subdir"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> autoreconf --install --force</span><br><span> ./configure --prefix="$inst/stow/$project" --with-systemdsystemunitdir="$inst/stow/$project/lib/systemd/system" $cfg</span><br><span> $MAKE $PARALLEL_MAKE install</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13413">change 13413</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/13413"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I852e103e80bf295f692cf13c4cb38e80fbc19eca </div>
<div style="display:none"> Gerrit-Change-Number: 13413 </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-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>