[MERGED] openbsc[master]: jenkins: fix build of --enable-iu: use osmo-iuh tag 'old_sua'

2017-07-10 Thread Neels Hofmeyr
Neels Hofmeyr has submitted this change and it was merged.

Change subject: jenkins: fix build of --enable-iu: use osmo-iuh tag 'old_sua'
..


jenkins: fix build of --enable-iu: use osmo-iuh tag 'old_sua'

We are building with libosmo-sccp tag 'old_sua' until the new sigtran has
been applied. Since osmo-iuh commit
  e26bc1855326399733ee78ac84c8d33319f36dfb
  "move openbsc.git's iu.h, iu.c, iu_vty.c here as iu_client"
osmo-iuh requires libosmo-sccp master. A similar 'old_sua' tag is in place in
osmo-iuh.git, to match libosmo-sccp 'old_sua'. Do that to fix the jenkins
build of --enable-iu.

Change-Id: I7c98b8bb1027fe8b47d8dcc4e0b94c1b42e44c52
---
M contrib/jenkins.sh
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 0021947..068ee34 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -19,6 +19,7 @@
 
 if [ "x$IU" = "x--enable-iu" ]; then
sccp_branch="old_sua"
+   osmo_iuh_branch="old_sua"
 fi
 
 osmo-build-dep.sh libosmo-abis
@@ -30,7 +31,7 @@
 if [ "x$IU" = "x--enable-iu" ]; then
osmo-build-dep.sh libasn1c
#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in 
osmo-iuh
-   osmo-build-dep.sh osmo-iuh
+   osmo-build-dep.sh osmo-iuh $osmo_iuh_branch
 fi
 
 set +x

-- 
To view, visit https://gerrit.osmocom.org/3172
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c98b8bb1027fe8b47d8dcc4e0b94c1b42e44c52
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 


openbsc[master]: jenkins: fix build of --enable-iu: use osmo-iuh tag 'old_sua'

2017-07-10 Thread Neels Hofmeyr

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/3172
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7c98b8bb1027fe8b47d8dcc4e0b94c1b42e44c52
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No


[PATCH] openbsc[master]: jenkins: fix build of --enable-iu: use osmo-iuh tag 'old_sua'

2017-07-10 Thread Neels Hofmeyr

Review at  https://gerrit.osmocom.org/3172

jenkins: fix build of --enable-iu: use osmo-iuh tag 'old_sua'

We are building with libosmo-sccp tag 'old_sua' until the new sigtran has
been applied. Since osmo-iuh commit
  e26bc1855326399733ee78ac84c8d33319f36dfb
  "move openbsc.git's iu.h, iu.c, iu_vty.c here as iu_client"
osmo-iuh requires libosmo-sccp master. A similar 'old_sua' tag is in place in
osmo-iuh.git, to match libosmo-sccp 'old_sua'. Do that to fix the jenkins
build of --enable-iu.

Change-Id: I7c98b8bb1027fe8b47d8dcc4e0b94c1b42e44c52
---
M contrib/jenkins.sh
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/72/3172/1

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 0021947..068ee34 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -19,6 +19,7 @@
 
 if [ "x$IU" = "x--enable-iu" ]; then
sccp_branch="old_sua"
+   osmo_iuh_branch="old_sua"
 fi
 
 osmo-build-dep.sh libosmo-abis
@@ -30,7 +31,7 @@
 if [ "x$IU" = "x--enable-iu" ]; then
osmo-build-dep.sh libasn1c
#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in 
osmo-iuh
-   osmo-build-dep.sh osmo-iuh
+   osmo-build-dep.sh osmo-iuh $osmo_iuh_branch
 fi
 
 set +x

-- 
To view, visit https://gerrit.osmocom.org/3172
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c98b8bb1027fe8b47d8dcc4e0b94c1b42e44c52
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr