<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10970">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">build: Add overload to clone repo and build in subdirectory<br><br>To build osmo-nitb we need to clone "openbsc" and then enter the<br>"openbsc" sub-directory. For building "mobile" and "virt_phy" of<br>OsmocomBB we will need to do something similar. Instead of added<br>more hardcoded paths, add a variant that allows to specify the<br>source directory.<br><br>Change-Id: I67fbd54296f2c68316bf8e89cfeb37d147193d53<br>---<br>M contrib/jenkins-build-common.sh<br>M contrib/jenkins-build-osmo-nitb.sh<br>2 files changed, 14 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/70/10970/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh</span><br><span>index 731bf58..c2ffbb4 100644</span><br><span>--- a/contrib/jenkins-build-common.sh</span><br><span>+++ b/contrib/jenkins-build-common.sh</span><br><span>@@ -12,6 +12,7 @@</span><br><span> # build_repo libosmocore --configure --opts</span><br><span> # build_repo libosmo-foo special_branch --configure --opts</span><br><span> # build_repo osmo-bar</span><br><span style="color: hsl(120, 100%, 40%);">+# build_repo_dir openbsc ./openbsc</span><br><span> #</span><br><span> # create_bin_tgz</span><br><span> #--------------</span><br><span>@@ -98,11 +99,19 @@</span><br><span> </span><br><span> build_repo() {</span><br><span>   # usage: build_repo <name> [<branch>] [--configure-opts [...]]</span><br><span style="color: hsl(120, 100%, 40%);">+  dir="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+  shift</span><br><span style="color: hsl(120, 100%, 40%);">+  build_repo_dir "${dir}" "./" $@</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%);">+build_repo_dir() {</span><br><span style="color: hsl(120, 100%, 40%);">+  # usage: build_repo_dir <name> <dir> [<branch>] [--configure-opts [...]]</span><br><span>   dep="$1"</span><br><span style="color: hsl(120, 100%, 40%);">+  dir="$2"</span><br><span>   branch="master"</span><br><span style="color: hsl(0, 100%, 40%);">-  if [ -z "$(echo "$2" | grep '^-')" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+  if [ -z "$(echo "$3" | grep '^-')" ]; then</span><br><span>     # second arg does not start with a dash, it's empty or a branch</span><br><span style="color: hsl(0, 100%, 40%);">-    branch="$2"</span><br><span style="color: hsl(120, 100%, 40%);">+    branch="$3"</span><br><span>     if [ -n "$branch" ]; then</span><br><span>       # we had a branch arg, need to shift once more to get config options</span><br><span>       shift</span><br><span>@@ -111,6 +120,7 @@</span><br><span>     fi</span><br><span>   fi</span><br><span>   shift</span><br><span style="color: hsl(120, 100%, 40%);">+  shift</span><br><span>   configure_opts="$@"</span><br><span> </span><br><span>   set +x; echo "</span><br><span>@@ -122,12 +132,7 @@</span><br><span> </span><br><span>   have_repo "$dep" "$branch"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  cd "$dep"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  # special shim: we know the openbsc.git needs to be built in the openbsc/ subdir.</span><br><span style="color: hsl(0, 100%, 40%);">-  if [ "$dep" = "openbsc" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">-    cd openbsc</span><br><span style="color: hsl(0, 100%, 40%);">-  fi</span><br><span style="color: hsl(120, 100%, 40%);">+  cd "$dep/${dir}"</span><br><span> </span><br><span>   set +x; echo; echo; set -x</span><br><span>   autoreconf -fi</span><br><span>diff --git a/contrib/jenkins-build-osmo-nitb.sh b/contrib/jenkins-build-osmo-nitb.sh</span><br><span>index 1e3ecc6..4f81fa8 100755</span><br><span>--- a/contrib/jenkins-build-osmo-nitb.sh</span><br><span>+++ b/contrib/jenkins-build-osmo-nitb.sh</span><br><span>@@ -10,6 +10,6 @@</span><br><span> build_repo openggsn</span><br><span> build_repo libsmpp34</span><br><span> build_repo libosmo-sccp</span><br><span style="color: hsl(0, 100%, 40%);">-build_repo openbsc --enable-smpp --enable-osmo-bsc --enable-nat</span><br><span style="color: hsl(120, 100%, 40%);">+build_repo_dir openbsc openbsc --enable-smpp --enable-osmo-bsc --enable-nat</span><br><span> </span><br><span> create_bin_tgz "osmo-nitb osmo-bsc_mgcp"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10970">change 10970</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/10970"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I67fbd54296f2c68316bf8e89cfeb37d147193d53 </div>
<div style="display:none"> Gerrit-Change-Number: 10970 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>