diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/eneanfvaccess.conf | 12 | ||||
-rw-r--r-- | conf/layer.conf | 1 | ||||
-rw-r--r-- | conf/template.atom-c3000-debug/local.conf.sample | 11 | ||||
-rw-r--r-- | conf/template.atom-c3000/local.conf.sample | 11 | ||||
-rw-r--r-- | conf/template.qemux86-64/bblayers.conf.sample | 2 | ||||
-rw-r--r-- | conf/template.xeon-d-debug/local.conf.sample | 11 | ||||
-rw-r--r-- | conf/template.xeon-d/local.conf.sample | 11 |
7 files changed, 16 insertions, 43 deletions
diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index ed7383e..608c103 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf | |||
@@ -7,14 +7,24 @@ DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" | |||
7 | 7 | ||
8 | SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" | 8 | SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" |
9 | 9 | ||
10 | # OSTree integration | ||
11 | require ${@bb.utils.contains('SOTA_MACHINE', '${MACHINE}', 'conf/distro/sota.conf.inc', '', d)} | ||
12 | |||
10 | INHERIT += "distrooverrides" | 13 | INHERIT += "distrooverrides" |
11 | DISTRO_FEATURES_append = " odm efi-secure-boot" | 14 | DISTRO_FEATURES_append = " odm efi-secure-boot usrmerge" |
12 | DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" | 15 | DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" |
13 | 16 | ||
14 | PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" | 17 | PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" |
15 | PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" | 18 | PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" |
16 | PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" | 19 | PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" |
17 | 20 | ||
21 | # Override ESP mount path set by meta/conf/image-uefi.conf to align with meta-secure-core paths | ||
22 | EFI_PREFIX_df-efi-secure-boot = "/boot/efi" | ||
18 | SBFOLDER = "bootloader" | 23 | SBFOLDER = "bootloader" |
19 | 24 | ||
20 | HOSTTOOLS_append = " scp" | 25 | HOSTTOOLS_append = " scp" |
26 | |||
27 | BB_HASHBASE_WHITELIST_append += "\ | ||
28 | SAMPLE_UEFI_SB_KEYS_DIR \ | ||
29 | SAMPLE_BOOT_KEYS_DIR \ | ||
30 | " | ||
diff --git a/conf/layer.conf b/conf/layer.conf index 7fec7c8..db496a4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -11,3 +11,4 @@ BBFILE_COLLECTIONS += "el-nfv-access" | |||
11 | BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/" | 11 | BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/" |
12 | BBFILE_PRIORITY_el-nfv-access = "7" | 12 | BBFILE_PRIORITY_el-nfv-access = "7" |
13 | LAYERDEPENDS_el-nfv-access = "nfv-access-common enea-virtualization" | 13 | LAYERDEPENDS_el-nfv-access = "nfv-access-common enea-virtualization" |
14 | LAYERSERIES_COMPAT_el-nfv-access = "hardknott" | ||
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 |
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 |
diff --git a/conf/template.qemux86-64/bblayers.conf.sample b/conf/template.qemux86-64/bblayers.conf.sample index ea5510a..214386c 100644 --- a/conf/template.qemux86-64/bblayers.conf.sample +++ b/conf/template.qemux86-64/bblayers.conf.sample | |||
@@ -21,6 +21,4 @@ BBLAYERS ?= " \ | |||
21 | ##OEROOT##/meta-openembedded/meta-filesystems \ | 21 | ##OEROOT##/meta-openembedded/meta-filesystems \ |
22 | ##OEROOT##/meta-openembedded/meta-python \ | 22 | ##OEROOT##/meta-openembedded/meta-python \ |
23 | ##OEROOT##/meta-openembedded/meta-webserver \ | 23 | ##OEROOT##/meta-openembedded/meta-webserver \ |
24 | ##OEROOT##/meta-cloud-services \ | ||
25 | ##OEROOT##/meta-cloud-services/meta-openstack \ | ||
26 | " | 24 | " |
diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample index 6474a37..4be1706 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 |
diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index 5cfebf5..a1a874d 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 |