From f6dee7ff95ceb5deb4483466194ce0cf75860053 Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Wed, 5 Jan 2022 12:44:14 +0100
Subject: [PATCH] Use osmo-hnbgw from osmo-hnbgw.git instead of osmo-iuh.git

Starting with release 1.2.0 of both repos, osmo-hnbgw binary is in
osmo-hnbgw.git, not osmo-iuh.git anymore.

Change-Id: I4ac6ede6a5b25ada211674bf3c46d79d7720a4bc
---
 make/Makefile                |  2 ++
 osmo-bisect.sh               |  5 +----
 osmo-hnbgw-master/Dockerfile | 15 +++++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/make/Makefile b/make/Makefile
index 8bd360d1..e314618f 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -26,6 +26,7 @@ OSMO_GBPROXY_BRANCH?=master
 OSMO_GGSN_BRANCH?=master
 OSMO_GSM_TESTER_BRANCH?=master
 OSMO_HLR_BRANCH?=master
+OSMO_HNBGW_BRANCH?=master
 OSMO_HNODEB_BRANCH?=master
 OSMO_IUH_BRANCH?=master
 OSMO_MGW_BRANCH?=master
@@ -101,6 +102,7 @@ docker-build: .release
 		--build-arg OSMO_GGSN_BRANCH=$(OSMO_GGSN_BRANCH) \
 		--build-arg OSMO_GSM_TESTER_BRANCH=$(OSMO_GSM_TESTER_BRANCH) \
 		--build-arg OSMO_HLR_BRANCH=$(OSMO_HLR_BRANCH) \
+		--build-arg OSMO_HNBGW_BRANCH=$(OSMO_HNBGW_BRANCH) \
 		--build-arg OSMO_HNODEB_BRANCH=$(OSMO_HNODEB_BRANCH) \
 		--build-arg OSMO_IUH_BRANCH=$(OSMO_IUH_BRANCH) \
 		--build-arg OSMO_MGW_BRANCH=$(OSMO_MGW_BRANCH) \
diff --git a/osmo-bisect.sh b/osmo-bisect.sh
index 5ca69cd5..68ece722 100755
--- a/osmo-bisect.sh
+++ b/osmo-bisect.sh
@@ -20,10 +20,7 @@ TESTCASE=$2
 COMMIT=$(git log -1 --format=format:%H)
 
 case $COMP_LOWER in
-	"hnbgw")
-		BRANCH="OSMO_IUH_BRANCH"
-		SUITE="ttcn3-hnbgw-test"
-		;;
+	"hnbgw"|\
 	"bsc"|\
 	"bts"|\
 	"ggsn"|\
diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile
index 9101e0cc..06c16b28 100644
--- a/osmo-hnbgw-master/Dockerfile
+++ b/osmo-hnbgw-master/Dockerfile
@@ -10,19 +10,22 @@ RUN	apt-get update && \
 		libosmo-abis-dev \
 		libosmo-netif-dev \
 		libosmo-sigtran-dev \
+		libosmo-ranap-dev \
+		libosmo-rua-dev \
+		libosmo-hnbap-dev \
 		libasn1c-dev && \
 	apt-get clean
 
 WORKDIR	/tmp
 
-ARG	OSMO_IUH_BRANCH="master"
+ARG	OSMO_HNBGW_BRANCH="master"
 
-RUN	git clone git://git.osmocom.org/osmo-iuh.git
-ADD	http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-mgw
+RUN	git clone git://git.osmocom.org/osmo-hnbgw.git
+ADD	http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_HNBGW_BRANCH /tmp/commit-osmo-hnbgw
 
-RUN	cd osmo-iuh && \
-	git fetch && git checkout $OSMO_IUH_BRANCH && \
-	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_IUH_BRANCH || exit 1); \
+RUN	cd osmo-hnbgw && \
+	git fetch && git checkout $OSMO_HNBGW_BRANCH && \
+	(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_HNBGW_BRANCH || exit 1); \
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \