6 files changed, 33 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 ?= " \
   ##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"
diff --git a/images/core-image-minimal-initramfs.bbappend b/images/core-image-minimal-initramfs.bbappend
index bdba015..2ca1d47 100644
--- a/images/core-image-minimal-initramfs.bbappend
+++ b/images/core-image-minimal-initramfs.bbappend
@@ -1 +1,5 @@
 PACKAGE_INSTALL += " nfv-installer kernel-modules"
+
+# ostree-switchroot is used by the init script to switch root to the
+# ostree version specified in the kernel command line
+PACKAGE_INSTALL_append_sota = " ostree-switchroot"
diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc
index 866fa99..83d7bd0 100644
--- a/images/enea-nfv-access-host-common.inc
+++ b/images/enea-nfv-access-host-common.inc
@@ -19,3 +19,10 @@ SYSLINUX_DEFAULT_CONSOLE_x86-64 = "console=tty0"
 GRUB_TIMEOUT_x86-64 = "10"
 # 10 - 1sec
 SYSLINUX_TIMEOUT_x86-64 = "50"
+
+# If building with sota enabled, build the otaimg before the hddimg, because
+# the hddimg needs it as a base image
+python __anonymous() {
+    if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d):
+        d.appendVarFlag("do_bootimg", "depends", " %s:do_image_otaimg" % d.getVar("IMAGE_BASENAME", True))
+}