From ef80bf1800b4109e443cb35bd083a8a4a1e6891c Mon Sep 17 00:00:00 2001
From: Daniel Willmann <dwillmann@sysmocom.de>
Date: Mon, 8 May 2017 16:09:18 +0200
Subject: [PATCH] osmocom-3g: Fix recipe for 3G image

Don't include mncc-upgrage patch and fix path for S
Install the service files manually instead of using foreach
---
 recipes-osmocom/osmocom-3g/osmocom-3g.inc       |  6 +++---
 .../osmocom-3g/upgrade-mncc-version.patch       | 17 -----------------
 recipes-osmocom/osmocom-3g/osmocom-3g_git.bb    |  5 ++---
 3 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 recipes-osmocom/osmocom-3g/osmocom-3g/upgrade-mncc-version.patch

diff --git a/recipes-osmocom/osmocom-3g/osmocom-3g.inc b/recipes-osmocom/osmocom-3g/osmocom-3g.inc
index b9d4197cc6..87c110b2f4 100644
--- a/recipes-osmocom/osmocom-3g/osmocom-3g.inc
+++ b/recipes-osmocom/osmocom-3g/osmocom-3g.inc
@@ -37,9 +37,9 @@ do_install_append() {
 
 	# Install systemd files and enable on sysinit
 	install -d ${D}${systemd_unitdir}/system
-	for i in `ls ${S}/contrib/systemd`; do
-		install -m 0644 ${S}/contrib/systemd/$i ${D}${systemd_unitdir}/system/
-	done
+	install -m 0644 ${S}/contrib/systemd/osmo-msc.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${S}/contrib/systemd/osmo-sgsn.service ${D}${systemd_unitdir}/system/
+	install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_unitdir}/system/
 
 	install -d ${D}/var/lib/osmocom
 }
diff --git a/recipes-osmocom/osmocom-3g/osmocom-3g/upgrade-mncc-version.patch b/recipes-osmocom/osmocom-3g/osmocom-3g/upgrade-mncc-version.patch
deleted file mode 100644
index b856cc3ce3..0000000000
--- a/recipes-osmocom/osmocom-3g/osmocom-3g/upgrade-mncc-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-lcr uses MNCC_SOCK_VERSION 5, but this is binary compatible to
-what openbsc thinks is version 4.  The only difference is the added
-RTP related commands, which are optional.
-
-Index: openbsc/include/openbsc/mncc.h
-===================================================================
---- openbsc.orig/include/openbsc/mncc.h
-+++ openbsc/include/openbsc/mncc.h
-@@ -163,7 +163,7 @@ struct gsm_data_frame {
- 	unsigned char	data[0];
- };
- 
--#define MNCC_SOCK_VERSION	4
-+#define MNCC_SOCK_VERSION	5
- struct gsm_mncc_hello {
- 	uint32_t	msg_type;
- 	uint32_t	version;
diff --git a/recipes-osmocom/osmocom-3g/osmocom-3g_git.bb b/recipes-osmocom/osmocom-3g/osmocom-3g_git.bb
index b31d2908b6..7128b69e88 100644
--- a/recipes-osmocom/osmocom-3g/osmocom-3g_git.bb
+++ b/recipes-osmocom/osmocom-3g/osmocom-3g_git.bb
@@ -6,7 +6,6 @@ PR = "${INC_PR}.6"
 
 # openbsc.git branch vlr_3G
 SRCREV = "2e8ecf3af3c1ffab29357f45e4576b2d3b9268e4"
-SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \
-    file://upgrade-mncc-version.patch"
+SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
 
-S = "${WORKDIR}/git/osmocom-3g"
+S = "${WORKDIR}/git/openbsc"