diff options
Diffstat (limited to 'conf/template.xeon-d/local.conf.sample')
-rw-r--r-- | conf/template.xeon-d/local.conf.sample | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index 5cfebf5..2b10f27 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample | |||
@@ -153,6 +153,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" | |||
153 | # - 'image-swab' to perform host system intrusion detection | 153 | # - 'image-swab' to perform host system intrusion detection |
154 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink | 154 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink |
155 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended | 155 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended |
156 | # NOTE: image-prelink is removed by sota.conf.inc | ||
156 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" | 157 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" |
157 | 158 | ||
158 | # | 159 | # |
@@ -239,16 +240,6 @@ CONF_VERSION = "1" | |||
239 | 240 | ||
240 | SKIP_META_VIRT_SANITY_CHECK = "1" | 241 | SKIP_META_VIRT_SANITY_CHECK = "1" |
241 | 242 | ||
242 | # | ||
243 | # OSTree integration | ||
244 | # | ||
245 | |||
246 | SOTA_MACHINE ?= "${MACHINE}" | ||
247 | |||
248 | DISTRO_FEATURES_append = " sota" | ||
249 | DISTRO_FEATURES_NATIVE_append = " sota" | ||
250 | INHERIT += " sota" | ||
251 | |||
252 | # Various packages dynamically add users and groups to the system at package | 243 | # Various packages dynamically add users and groups to the system at package |
253 | # install time. For programs that do not care what the uid/gid is of the | 244 | # install time. For programs that do not care what the uid/gid is of the |
254 | # resulting users/groups, the order of the install will determine the final | 245 | # resulting users/groups, the order of the install will determine the final |
@@ -274,3 +265,6 @@ USERADD_GID_TABLES = "files/group" | |||
274 | # Unfortunately, setting the variable below breaks the build, so do not set it | 265 | # Unfortunately, setting the variable below breaks the build, so do not set it |
275 | # for now | 266 | # for now |
276 | # USERADD_ERROR_DYNAMIC = "1" | 267 | # USERADD_ERROR_DYNAMIC = "1" |
268 | |||
269 | # to be removed together with python2 layer | ||
270 | I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" | ||