From 41591d4f8c586aa801220fac0924556f406c58bd Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Tue, 8 Dec 2020 11:15:02 +0100
Subject: SPEC-3723: restructure meta-agl-demo

All demo related components should be in here now.

We keep the packagegroups on purpose for now to stay backward-compatible.

v2: layer does pass yocto-check-layer, dependencies adapted
v3: remove the dynamic-layer setup, use all-in-one approach
v4: Fixed comments from Paul Barker. Tnx!
v5: Removed wayland/weston/agl-compositor additions, except for demo
    specific weston-init bbappend

Follow-up changes required later:
      - massaging packagegroups
      - scrub of recipes

Bug-AGL: SPEC-3723

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8
---
 ...llow-duplicate-entries-from-mbpi_lookup_a.patch | 27 +++++++++++++++++++
 recipes-connectivity/ofono/files/ofono.conf        | 30 ++++++++++++++++++++++
 recipes-connectivity/ofono/ofono_%.bbappend        |  1 +
 recipes-connectivity/ofono/ofono_agldemo.inc       | 11 ++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 recipes-connectivity/ofono/files/0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch
 create mode 100644 recipes-connectivity/ofono/files/ofono.conf
 create mode 100644 recipes-connectivity/ofono/ofono_%.bbappend
 create mode 100644 recipes-connectivity/ofono/ofono_agldemo.inc

(limited to 'recipes-connectivity/ofono')

diff --git a/recipes-connectivity/ofono/files/0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch b/recipes-connectivity/ofono/files/0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch
new file mode 100644
index 00000000..7b44e483
--- /dev/null
+++ b/recipes-connectivity/ofono/files/0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch
@@ -0,0 +1,27 @@
+From 7782f8f9d9634ebeddafefedab10ba254f9cc34a Mon Sep 17 00:00:00 2001
+From: Matt Ranostay <matt.ranostay@konsulko.com>
+Date: Fri, 1 Mar 2019 17:53:17 +0900
+Subject: [PATCH] provision: allow duplicate entries from mbpi_lookup_apn()
+ results
+
+Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
+---
+ plugins/provision.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/provision.c b/plugins/provision.c
+index 99c299eb..aa0b05e4 100644
+--- a/plugins/provision.c
++++ b/plugins/provision.c
+@@ -50,7 +50,7 @@ static int provision_get_settings(const char *mcc, const char *mnc,
+ 
+ 	DBG("Provisioning for MCC %s, MNC %s, SPN '%s'", mcc, mnc, spn);
+ 
+-	apns = mbpi_lookup_apn(mcc, mnc, FALSE, &error);
++	apns = mbpi_lookup_apn(mcc, mnc, TRUE, &error);
+ 	if (apns == NULL) {
+ 		if (error != NULL) {
+ 			ofono_error("%s", error->message);
+-- 
+2.20.1
+
diff --git a/recipes-connectivity/ofono/files/ofono.conf b/recipes-connectivity/ofono/files/ofono.conf
new file mode 100644
index 00000000..e47214c7
--- /dev/null
+++ b/recipes-connectivity/ofono/files/ofono.conf
@@ -0,0 +1,30 @@
+<!-- This configuration file specifies the required security policies
+     for oFono core daemon to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+  <policy user="root">
+    <allow own="org.ofono"/>
+    <allow send_destination="org.ofono"/>
+    <allow send_interface="org.ofono.Manager"/>
+    <allow send_interface="org.ofono.SimToolkitAgent"/>
+    <allow send_interface="org.ofono.PushNotificationAgent"/>
+    <allow send_interface="org.ofono.SmartMessagingAgent"/>
+    <allow send_interface="org.ofono.PositioningRequestAgent"/>
+    <allow send_interface="org.ofono.HandsfreeAudioAgent"/>
+    <allow send_interface="org.ofono.Modem"/>
+  </policy>
+
+  <policy at_console="true">
+    <allow send_destination="org.ofono"/>
+  </policy>
+
+  <policy context="default">
+    <deny send_destination="org.ofono"/>
+  </policy>
+
+</busconfig>
diff --git a/recipes-connectivity/ofono/ofono_%.bbappend b/recipes-connectivity/ofono/ofono_%.bbappend
new file mode 100644
index 00000000..0386aa9c
--- /dev/null
+++ b/recipes-connectivity/ofono/ofono_%.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agldemo', 'ofono_agldemo.inc', '', d)}
diff --git a/recipes-connectivity/ofono/ofono_agldemo.inc b/recipes-connectivity/ofono/ofono_agldemo.inc
new file mode 100644
index 00000000..b02d6ee2
--- /dev/null
+++ b/recipes-connectivity/ofono/ofono_agldemo.inc
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI_append = "\
+    file://ofono.conf \
+    file://0001-provision-allow-duplicate-entries-from-mbpi_lookup_a.patch \
+    "
+
+do_install_append() {
+    install -m 0644 ${WORKDIR}/ofono.conf ${D}${sysconfdir}/dbus-1/system.d/ofono.conf
+}
+
+SYSTEMD_AUTO_ENABLE = "enable"
-- 
cgit 1.2.3-korg