summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Scrieciu <cristian.scrieciu@enea.com>2018-11-20 16:07:25 +0100
committerGerrit Code Review <gerrit2@sestogerrit02>2018-11-20 16:07:25 +0100
commit0d4b7a4eb164a657c7ebde2cc71d6fb764ee6c1c (patch)
treeefc73ca8434ca3f5e07c5a5bec8962eff99c50d8
parent27976149d6c445ba12bd100de6f95788a2eebb16 (diff)
parent97244af212f52666a01963d0dc8e20f1eca180fb (diff)
downloadmeta-el-nfv-access-0d4b7a4eb164a657c7ebde2cc71d6fb764ee6c1c.tar.gz
Merge "OSTree: Include sota class and updater layer in templates" into rocko
-rw-r--r--conf/template.atom-c3000/bblayers.conf.sample1
-rw-r--r--conf/template.atom-c3000/local.conf.sample10
-rw-r--r--conf/template.xeon-d/bblayers.conf.sample1
-rw-r--r--conf/template.xeon-d/local.conf.sample10
4 files changed, 22 insertions, 0 deletions
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 ?= " \
24 ##OEROOT##/meta-cloud-services \ 24 ##OEROOT##/meta-cloud-services \
25 ##OEROOT##/meta-cloud-services/meta-openstack \ 25 ##OEROOT##/meta-cloud-services/meta-openstack \
26 ##OEROOT##/meta-java \ 26 ##OEROOT##/meta-java \
27 ##OEROOT##/meta-updater \
27 " 28 "
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"
237CONF_VERSION = "1" 237CONF_VERSION = "1"
238 238
239SKIP_META_VIRT_SANITY_CHECK = "1" 239SKIP_META_VIRT_SANITY_CHECK = "1"
240
241#
242# OSTree integration
243#
244
245SOTA_MACHINE ?= "${MACHINE}"
246
247DISTRO_FEATURES_append = " sota"
248DISTRO_FEATURES_NATIVE_append = " sota"
249INHERIT += " 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 ?= " \
24 ##OEROOT##/meta-cloud-services \ 24 ##OEROOT##/meta-cloud-services \
25 ##OEROOT##/meta-cloud-services/meta-openstack \ 25 ##OEROOT##/meta-cloud-services/meta-openstack \
26 ##OEROOT##/meta-java \ 26 ##OEROOT##/meta-java \
27 ##OEROOT##/meta-updater \
27 " 28 "
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"
238CONF_VERSION = "1" 238CONF_VERSION = "1"
239 239
240SKIP_META_VIRT_SANITY_CHECK = "1" 240SKIP_META_VIRT_SANITY_CHECK = "1"
241
242#
243# OSTree integration
244#
245
246SOTA_MACHINE ?= "${MACHINE}"
247
248DISTRO_FEATURES_append = " sota"
249DISTRO_FEATURES_NATIVE_append = " sota"
250INHERIT += " sota"