diff options
Diffstat (limited to 'conf/template.xeon-d-debug/local.conf.sample')
-rw-r--r-- | conf/template.xeon-d-debug/local.conf.sample | 14 |
1 files changed, 4 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..e80ee61 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 = " \ | |||
156 | # - 'image-swab' to perform host system intrusion detection | 156 | # - 'image-swab' to perform host system intrusion detection |
157 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink | 157 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink |
158 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended | 158 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended |
159 | # NOTE: image-prelink is removed by sota.conf.inc | ||
159 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" | 160 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" |
160 | 161 | ||
161 | # | 162 | # |
@@ -242,16 +243,6 @@ CONF_VERSION = "1" | |||
242 | 243 | ||
243 | SKIP_META_VIRT_SANITY_CHECK = "1" | 244 | SKIP_META_VIRT_SANITY_CHECK = "1" |
244 | 245 | ||
245 | # | ||
246 | # OSTree integration | ||
247 | # | ||
248 | |||
249 | SOTA_MACHINE ?= "${MACHINE}" | ||
250 | |||
251 | DISTRO_FEATURES_append = " sota" | ||
252 | DISTRO_FEATURES_NATIVE_append = " sota" | ||
253 | INHERIT += " sota" | ||
254 | |||
255 | # Various packages dynamically add users and groups to the system at package | 246 | # Various packages dynamically add users and groups to the system at package |
256 | # install time. For programs that do not care what the uid/gid is of the | 247 | # install time. For programs that do not care what the uid/gid is of the |
257 | # resulting users/groups, the order of the install will determine the final | 248 | # resulting users/groups, the order of the install will determine the final |
@@ -277,3 +268,6 @@ USERADD_GID_TABLES = "files/group" | |||
277 | # Unfortunately, setting the variable below breaks the build, so do not set it | 268 | # Unfortunately, setting the variable below breaks the build, so do not set it |
278 | # for now | 269 | # for now |
279 | # USERADD_ERROR_DYNAMIC = "1" | 270 | # USERADD_ERROR_DYNAMIC = "1" |
271 | |||
272 | # to be removed together with python2 layer | ||
273 | I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" | ||