<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13112">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib: Use proper SDK for OC2G builds<br><br>Binaries produced by sysmobts SDK are not compatible with OC2G.<br><br>Change-Id: I5adde9cf8a5f84cfc4b6fc4d4def3836444929ec<br>---<br>M contrib/jenkins-build-osmo-bts-oc2g.sh<br>M contrib/jenkins-build-osmo-pcu-oc2g.sh<br>2 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh b/contrib/jenkins-build-osmo-bts-oc2g.sh</span><br><span>index 9ed2099..c4357f0 100755</span><br><span>--- a/contrib/jenkins-build-osmo-bts-oc2g.sh</span><br><span>+++ b/contrib/jenkins-build-osmo-bts-oc2g.sh</span><br><span>@@ -1,16 +1,16 @@</span><br><span> #!/bin/sh</span><br><span> set -e -x</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-_poky_version="$POKY_VERSION"</span><br><span style="color: hsl(0, 100%, 40%);">-_poky_path="$POKY_PATH"</span><br><span style="color: hsl(120, 100%, 40%);">+_poky_version="$POKY_OC2G_VERSION"</span><br><span style="color: hsl(120, 100%, 40%);">+_poky_path="$POKY_OC2G_PATH"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-[ -z "$_poky_version" ] && _poky_version="2.3.2"</span><br><span style="color: hsl(0, 100%, 40%);">-[ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version"</span><br><span style="color: hsl(120, 100%, 40%);">+[ -z "$_poky_version" ] && _poky_version="2.3.4"</span><br><span style="color: hsl(120, 100%, 40%);">+[ -z "$_poky_path" ] && _poky_path="/opt/poky-oc2g/$_poky_version"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-. "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi"</span><br><span style="color: hsl(120, 100%, 40%);">+. "$_poky_path/environment-setup-cortexa15hf-neon-poky-linux-gnueabi"</span><br><span> </span><br><span> # Cross-compilation: all installations need to be put in the sysmo SDK sysroot</span><br><span style="color: hsl(0, 100%, 40%);">-export DESTDIR="$_poky_path/sysroots/armv5te-poky-linux-gnueabi"</span><br><span style="color: hsl(120, 100%, 40%);">+export DESTDIR="$_poky_path/sysroots/cortexa15hf-neon-poky-linux-gnueabi"</span><br><span> </span><br><span> base="$PWD"</span><br><span> name="osmo-bts-oc2g"</span><br><span>diff --git a/contrib/jenkins-build-osmo-pcu-oc2g.sh b/contrib/jenkins-build-osmo-pcu-oc2g.sh</span><br><span>index 2164926..c10b14e 100755</span><br><span>--- a/contrib/jenkins-build-osmo-pcu-oc2g.sh</span><br><span>+++ b/contrib/jenkins-build-osmo-pcu-oc2g.sh</span><br><span>@@ -1,16 +1,16 @@</span><br><span> #!/bin/sh</span><br><span> set -e -x</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-_poky_version="$POKY_VERSION"</span><br><span style="color: hsl(0, 100%, 40%);">-_poky_path="$POKY_PATH"</span><br><span style="color: hsl(120, 100%, 40%);">+_poky_version="$POKY_OC2G_VERSION"</span><br><span style="color: hsl(120, 100%, 40%);">+_poky_path="$POKY_OC2G_PATH"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-[ -z "$_poky_version" ] && _poky_version="2.3.2"</span><br><span style="color: hsl(0, 100%, 40%);">-[ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version"</span><br><span style="color: hsl(120, 100%, 40%);">+[ -z "$_poky_version" ] && _poky_version="2.3.4"</span><br><span style="color: hsl(120, 100%, 40%);">+[ -z "$_poky_path" ] && _poky_path="/opt/poky-oc2g/$_poky_version"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-. "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi"</span><br><span style="color: hsl(120, 100%, 40%);">+. "$_poky_path/environment-setup-cortexa15hf-neon-poky-linux-gnueabi"</span><br><span> </span><br><span> # Cross-compilation: all installations need to be put in the sysmo SDK sysroot</span><br><span style="color: hsl(0, 100%, 40%);">-export DESTDIR="$_poky_path/sysroots/armv5te-poky-linux-gnueabi"</span><br><span style="color: hsl(120, 100%, 40%);">+export DESTDIR="$_poky_path/sysroots/cortexa15hf-neon-poky-linux-gnueabi"</span><br><span> </span><br><span> base="$PWD"</span><br><span> name="osmo-pcu-oc2g"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13112">change 13112</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/13112"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5adde9cf8a5f84cfc4b6fc4d4def3836444929ec </div>
<div style="display:none"> Gerrit-Change-Number: 13112 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>