diff options
author | Matei Valeanu <Matei.Valeanu@enea.com> | 2021-09-09 14:22:56 +0200 |
---|---|---|
committer | Matei Valeanu <Matei.Valeanu@enea.com> | 2021-09-09 14:22:56 +0200 |
commit | 8f49f61ef6df2db30b2b124b7ee5893124c70180 (patch) | |
tree | de596077e8b7925f42fffd38d25486b47177c336 /conf/template.atom-c3000/local.conf.sample | |
parent | 1a0d008b62062b3bdfa97ec4761347c0d0c4e652 (diff) | |
parent | 06cb3727c2a013ff6927f85b9cdd708177e17609 (diff) | |
download | meta-el-nfv-access-8f49f61ef6df2db30b2b124b7ee5893124c70180.tar.gz |
Merge branch 'develop'demo_CPDX-3644demo_CPDX-3634
Change-Id: I75bd22a68d9de4d96b65586be3c14fda7892b803
Diffstat (limited to 'conf/template.atom-c3000/local.conf.sample')
-rw-r--r-- | conf/template.atom-c3000/local.conf.sample | 11 |
1 files changed, 1 insertions, 10 deletions
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" | |||
152 | # - 'image-swab' to perform host system intrusion detection | 152 | # - 'image-swab' to perform host system intrusion detection |
153 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink | 153 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink |
154 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended | 154 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended |
155 | # NOTE: image-prelink is removed by sota.conf.inc | ||
155 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" | 156 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" |
156 | 157 | ||
157 | # | 158 | # |
@@ -238,16 +239,6 @@ CONF_VERSION = "1" | |||
238 | 239 | ||
239 | SKIP_META_VIRT_SANITY_CHECK = "1" | 240 | SKIP_META_VIRT_SANITY_CHECK = "1" |
240 | 241 | ||
241 | # | ||
242 | # OSTree integration | ||
243 | # | ||
244 | |||
245 | SOTA_MACHINE ?= "${MACHINE}" | ||
246 | |||
247 | DISTRO_FEATURES_append = " sota" | ||
248 | DISTRO_FEATURES_NATIVE_append = " sota" | ||
249 | INHERIT += " sota" | ||
250 | |||
251 | # Various packages dynamically add users and groups to the system at package | 242 | # Various packages dynamically add users and groups to the system at package |
252 | # install time. For programs that do not care what the uid/gid is of the | 243 | # install time. For programs that do not care what the uid/gid is of the |
253 | # resulting users/groups, the order of the install will determine the final | 244 | # resulting users/groups, the order of the install will determine the final |