From 9e88443f01c5524ec7ae9583db7524f81c7421fb Mon Sep 17 00:00:00 2001
From: Daniel Willmann <dwillmann@sysmocom.de>
Date: Mon, 8 May 2017 15:55:16 +0200
Subject: [PATCH] osmo-hlr: Fix recipe for 3G image

S is ${WORKDIR}/git/ and osmo-hlr is already the standard package (derived
from the filename)
Require sqlite3-native to create a sample hlr
---
 recipes-osmocom/osmo-hlr/osmo-hlr.inc    | 25 +++++++++---------------
 recipes-osmocom/osmo-hlr/osmo-hlr_git.bb |  4 ++--
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
index 4a549e8676..6bef6615c9 100644
--- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc
+++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
@@ -1,5 +1,5 @@
 DESCRIPTION = "Osmocom GSM/UMTS Home Location Register"
-DEPENDS = "libosmocore libosmo-abis libsqlite3"
+DEPENDS = "libosmocore libosmo-abis sqlite3 sqlite3-native"
 HOMEPAGE = "http://osmocom.org/projects/osmo-hlr"
 LICENSE = "AGPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
@@ -17,7 +17,7 @@ do_configure_prepend() {
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/osmocom
-	install -m 0660 ${S}/doc/examples/osmo-hlr/osmo-hlr.cfg ${D}${sysconfdir}/osmocom/osmo-hlr.cfg
+	install -m 0660 ${S}/doc/examples/osmo-hlr.cfg ${D}${sysconfdir}/osmocom/osmo-hlr.cfg
 
 	# Install sysv-init files
 	install -d ${D}${sysconfdir}/init.d
@@ -26,26 +26,19 @@ 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-hlr.service ${D}${systemd_unitdir}/system/
 
 	install -d ${D}/var/lib/osmocom
+	sqlite3 ${D}/var/lib/osmocom/hlr.db < ${S}/sql/hlr.sql
 }
 
-PACKAGES =+ "osmo-hlr"
-
 INITSCRIPT_PACKAGES = "osmo-hlr"
 
 # Do not start any of the services by default
 SYSTEMD_AUTO_ENABLE = "disable"
 
-CONFFILES_osmo-hlr = "${sysconfdir}/osmocom/osmo-hlr.cfg"
-INITSCRIPT_NAME_osmo-hlr = "osmo-hlr"
-INITSCRIPT_PARAMS_osmo-hlr = "defaults 30 30"
-FILES_osmo-hlr = " ${bindir}/osmo-hlr \
-		/var/lib/osmocom \
-		${sysconfdir}/init.d/osmo-hlr \
-		${sysconfdir}/osmocom/osmo-hlr.cfg \
-		${systemd_unitdir}/system/osmo-hlr.service \
-		"
+CONFFILES_${PN} = "${sysconfdir}/osmocom/osmo-hlr.cfg"
+INITSCRIPT_NAME_${PN} = "osmo-hlr"
+INITSCRIPT_PARAMS_${PN} = "defaults 30 30"
+
+FILES_${PN} += "${systemd_unitdir}/system/osmo-hlr.service"
diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
index b5cffe93b7..b90d8443ff 100644
--- a/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
+++ b/recipes-osmocom/osmo-hlr/osmo-hlr_git.bb
@@ -4,7 +4,7 @@ PV = "0.1.0+gitr${SRCPV}"
 PRINC = "0"
 PR = "${INC_PR}.1"
 
-SRCREV = "743cf42ac5dfa2661317e73f70b204bde7450ff2"
+SRCREV = "63b7e86dcf552fb04eab8337c930ced6c970b3c8"
 SRC_URI += "git://git.osmocom.org/osmo-hlr.git;protocol=git"
 
-S = "${WORKDIR}/git/osmo-hlr"
+S = "${WORKDIR}/git/"