Change in osmo-gsm-tester[master]: contrib: Use proper SDK for OC2G builds

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Fri Mar 15 20:16:14 UTC 2019


Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/13112 )

Change subject: contrib: Use proper SDK for OC2G builds
......................................................................

contrib: Use proper SDK for OC2G builds

Binaries produced by sysmobts SDK are not compatible with OC2G.

Change-Id: I5adde9cf8a5f84cfc4b6fc4d4def3836444929ec
---
M contrib/jenkins-build-osmo-bts-oc2g.sh
M contrib/jenkins-build-osmo-pcu-oc2g.sh
2 files changed, 12 insertions(+), 12 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh b/contrib/jenkins-build-osmo-bts-oc2g.sh
index 9ed2099..c4357f0 100755
--- a/contrib/jenkins-build-osmo-bts-oc2g.sh
+++ b/contrib/jenkins-build-osmo-bts-oc2g.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 set -e -x
 
-_poky_version="$POKY_VERSION"
-_poky_path="$POKY_PATH"
+_poky_version="$POKY_OC2G_VERSION"
+_poky_path="$POKY_OC2G_PATH"
 
-[ -z "$_poky_version" ] && _poky_version="2.3.2"
-[ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version"
+[ -z "$_poky_version" ] && _poky_version="2.3.4"
+[ -z "$_poky_path" ] && _poky_path="/opt/poky-oc2g/$_poky_version"
 
-. "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi"
+. "$_poky_path/environment-setup-cortexa15hf-neon-poky-linux-gnueabi"
 
 # Cross-compilation: all installations need to be put in the sysmo SDK sysroot
-export DESTDIR="$_poky_path/sysroots/armv5te-poky-linux-gnueabi"
+export DESTDIR="$_poky_path/sysroots/cortexa15hf-neon-poky-linux-gnueabi"
 
 base="$PWD"
 name="osmo-bts-oc2g"
diff --git a/contrib/jenkins-build-osmo-pcu-oc2g.sh b/contrib/jenkins-build-osmo-pcu-oc2g.sh
index 2164926..c10b14e 100755
--- a/contrib/jenkins-build-osmo-pcu-oc2g.sh
+++ b/contrib/jenkins-build-osmo-pcu-oc2g.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
 set -e -x
 
-_poky_version="$POKY_VERSION"
-_poky_path="$POKY_PATH"
+_poky_version="$POKY_OC2G_VERSION"
+_poky_path="$POKY_OC2G_PATH"
 
-[ -z "$_poky_version" ] && _poky_version="2.3.2"
-[ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version"
+[ -z "$_poky_version" ] && _poky_version="2.3.4"
+[ -z "$_poky_path" ] && _poky_path="/opt/poky-oc2g/$_poky_version"
 
-. "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi"
+. "$_poky_path/environment-setup-cortexa15hf-neon-poky-linux-gnueabi"
 
 # Cross-compilation: all installations need to be put in the sysmo SDK sysroot
-export DESTDIR="$_poky_path/sysroots/armv5te-poky-linux-gnueabi"
+export DESTDIR="$_poky_path/sysroots/cortexa15hf-neon-poky-linux-gnueabi"
 
 base="$PWD"
 name="osmo-pcu-oc2g"

-- 
To view, visit https://gerrit.osmocom.org/13112
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I5adde9cf8a5f84cfc4b6fc4d4def3836444929ec
Gerrit-Change-Number: 13112
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190315/d655d02c/attachment.html>


More information about the gerrit-log mailing list