From 97244af212f52666a01963d0dc8e20f1eca180fb Mon Sep 17 00:00:00 2001
From: Gabriel Ionescu <gabriel.ionescu@enea.com>
Date: Thu, 1 Nov 2018 18:43:33 +0100
Subject: OSTree: Include sota class and updater layer in templates

Change-Id: I92bc5236519fbd9660eb40c981d5de12f6af89f0
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
---
 conf/template.atom-c3000/bblayers.conf.sample |  1 +
 conf/template.atom-c3000/local.conf.sample    | 10 ++++++++++
 conf/template.xeon-d/bblayers.conf.sample     |  1 +
 conf/template.xeon-d/local.conf.sample        | 10 ++++++++++
 4 files changed, 22 insertions(+)

diff --git a/conf/template.atom-c3000/bblayers.conf.sample b/conf/template.atom-c3000/bblayers.conf.sample
index 4f47b72..fbd6b42 100644
--- a/conf/template.atom-c3000/bblayers.conf.sample
+++ b/conf/template.atom-c3000/bblayers.conf.sample
@@ -24,4 +24,5 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-cloud-services \
   ##OEROOT##/meta-cloud-services/meta-openstack \
   ##OEROOT##/meta-java \
+  ##OEROOT##/meta-updater \
   "
diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample
index 38c9e8b..8c24e77 100644
--- a/conf/template.atom-c3000/local.conf.sample
+++ b/conf/template.atom-c3000/local.conf.sample
@@ -237,3 +237,13 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
 CONF_VERSION = "1"
 
 SKIP_META_VIRT_SANITY_CHECK = "1"
+
+#
+# OSTree integration
+#
+
+SOTA_MACHINE ?= "${MACHINE}"
+
+DISTRO_FEATURES_append = " sota"
+DISTRO_FEATURES_NATIVE_append = " sota"
+INHERIT += " sota"
diff --git a/conf/template.xeon-d/bblayers.conf.sample b/conf/template.xeon-d/bblayers.conf.sample
index 4f47b72..fbd6b42 100644
--- a/conf/template.xeon-d/bblayers.conf.sample
+++ b/conf/template.xeon-d/bblayers.conf.sample
@@ -24,4 +24,5 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-cloud-services \
   ##OEROOT##/meta-cloud-services/meta-openstack \
   ##OEROOT##/meta-java \
+  ##OEROOT##/meta-updater \
   "
diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample
index 00ad0f4..3b1063e 100644
--- a/conf/template.xeon-d/local.conf.sample
+++ b/conf/template.xeon-d/local.conf.sample
@@ -238,3 +238,13 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
 CONF_VERSION = "1"
 
 SKIP_META_VIRT_SANITY_CHECK = "1"
+
+#
+# OSTree integration
+#
+
+SOTA_MACHINE ?= "${MACHINE}"
+
+DISTRO_FEATURES_append = " sota"
+DISTRO_FEATURES_NATIVE_append = " sota"
+INHERIT += " sota"
-- 
cgit v1.2.3-54-g00ecf