From bee43bc3d4896603e4cb1839f5a4e8c30c771e5c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 27 Apr 2021 08:53:16 +0200 Subject: distro conf: require sota.conf.inc for atom, xeon Depends-on: I658c86f562743a50e5c078899e133e279b96027b Change-Id: I7165753a5f609ef337fd1f0b450f055a5768059e Signed-off-by: Alexandru Avadanii --- conf/template.atom-c3000/local.conf.sample | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'conf/template.atom-c3000/local.conf.sample') diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index b015f43..c6cbdba 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -152,6 +152,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - '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" # @@ -238,16 +239,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 -- cgit v1.2.3-54-g00ecf