From 9b02ca4c8ea81bba23f97b7eb1e8fe200102a9eb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org>
Date: Tue, 1 Oct 2019 11:56:02 +0200
Subject: [PATCH] Refactor packagegroup to enable sllin on h3
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Remove the restriction to only add sllin on m3 as we're moving
to the h3 in the demo.

v2: make the settings adjustable in local.conf and remove comment.

Bug-AGL: SPEC-2826

Change-Id: I09ea14934e3714daba6e94c81902453872ce1aa9
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 .../packagegroup-agl-demo-platform.bb              | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index 8a7b54917..d0de2bfc8 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -20,23 +20,30 @@ RDEPENDS_${PN} += "\
     packagegroup-agl-demo \
     "
 
-MOST_DRIVERS = " \
+# MOST out-of-tree kernel drivers
+#################################
+MOST_DRIVERS ??= " \
     most \
     "
-MOST_DRIVERS_append_m3ulcb = " sllin"
+# These boards use different kernels - needs to be checked
+MOST_DRIVERS_dra7xx-evm ?= ""
+MOST_DRIVERS_dragonboard-410c ?= ""
 
-# HVAC dependencies depend on drivers above
-MOST_HVAC = " "
-MOST_HVAC_append = " \
-    ${MOST_DRIVERS} \
+
+# HVAC dependencies
+###################
+LIN_DRIVERS ??= " sllin"
+# These boards use different kernels - needs to be checked
+LIN_DRIVERS_dra7xx-evm ?= ""
+LIN_DRIVERS_dragonboard-410c ?= ""
+
+# UNICENS service
+UNICENS ?= " \
     unicens-config \
     agl-service-unicens \
     agl-service-unicens-controller \
     "
 
-# @Chris: This needs to be checked!
-MOST_HVAC_dra7xx-evm = ""
-MOST_HVAC_dragonboard-410c = ""
 
 AGL_APPS = " \
     dashboard \
@@ -84,7 +91,9 @@ RDEPENDS_${PN}_append = " \
     qtquickcontrols2-agl \
     qtquickcontrols2-agl-style \
     linux-firmware-ralink \
-    ${MOST_HVAC} \
+    ${UNICENS} \
+    ${MOST_DRIVERS} \
+    ${LIN_DRIVERS} \
     ${AGL_APPS} \
     ${AGL_APIS} \
     ${QTAGLEXTRAS} \
-- 
2.16.6