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-debug | |
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-debug')
-rw-r--r-- | conf/template.atom-c3000-debug/conf-notes.txt | 2 | ||||
-rw-r--r-- | conf/template.atom-c3000-debug/local.conf.sample | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/conf/template.atom-c3000-debug/conf-notes.txt b/conf/template.atom-c3000-debug/conf-notes.txt index 1c1c026..d4da82b 100644 --- a/conf/template.atom-c3000-debug/conf-notes.txt +++ b/conf/template.atom-c3000-debug/conf-notes.txt | |||
@@ -1,2 +1,2 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access-debug | 2 | enea-edge-runtime-debug |
diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample index 60e8955..b96bf48 100644 --- a/conf/template.atom-c3000-debug/local.conf.sample +++ b/conf/template.atom-c3000-debug/local.conf.sample | |||
@@ -155,6 +155,7 @@ EXTRA_IMAGE_FEATURES = " \ | |||
155 | # - 'image-swab' to perform host system intrusion detection | 155 | # - 'image-swab' to perform host system intrusion detection |
156 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink | 156 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink |
157 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended | 157 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended |
158 | # NOTE: image-prelink is removed by sota.conf.inc | ||
158 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" | 159 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" |
159 | 160 | ||
160 | # | 161 | # |
@@ -241,16 +242,6 @@ CONF_VERSION = "1" | |||
241 | 242 | ||
242 | SKIP_META_VIRT_SANITY_CHECK = "1" | 243 | SKIP_META_VIRT_SANITY_CHECK = "1" |
243 | 244 | ||
244 | # | ||
245 | # OSTree integration | ||
246 | # | ||
247 | |||
248 | SOTA_MACHINE ?= "${MACHINE}" | ||
249 | |||
250 | DISTRO_FEATURES_append = " sota" | ||
251 | DISTRO_FEATURES_NATIVE_append = " sota" | ||
252 | INHERIT += " sota" | ||
253 | |||
254 | # Various packages dynamically add users and groups to the system at package | 245 | # Various packages dynamically add users and groups to the system at package |
255 | # install time. For programs that do not care what the uid/gid is of the | 246 | # install time. For programs that do not care what the uid/gid is of the |
256 | # resulting users/groups, the order of the install will determine the final | 247 | # resulting users/groups, the order of the install will determine the final |