Merge branch 'develop'demo_CPDX-3644demo_CPDX-3634

Change-Id: I75bd22a68d9de4d96b65586be3c14fda7892b803

1 files changed, 1 insertions, 10 deletions

diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample
index 6474a37..4be1706 100644
--- a/conf/template.xeon-d-debug/local.conf.sample
+++ b/conf/template.xeon-d-debug/local.conf.sample
@@ -156,6 +156,7 @@ EXTRA_IMAGE_FEATURES = " \
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+# NOTE: image-prelink is removed by sota.conf.inc
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
 #
@@ -242,16 +243,6 @@ 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"
-
 # Various packages dynamically add users and groups to the system at package
 # install time.  For programs that do not care what the uid/gid is of the
 # resulting users/groups, the order of the install will determine the final