diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2019-07-08 13:37:32 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2019-07-08 15:12:17 +0200 |
commit | 6180ad6f231100df6c0f7615cba74b0c44f8aaef (patch) | |
tree | 017e41d60c1a6c87f71b4b349310413d27ec215a | |
parent | 1004579ca431cdb239295dc6771af45b41b2791a (diff) | |
download | meta-el-nfv-access-6180ad6f231100df6c0f7615cba74b0c44f8aaef.tar.gz |
Move efi-secure-boot feature to nfvaccess distro definition
Change-Id: Ia9944b2ed8fad4a32984443b5ef98f287904c0d8
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
-rw-r--r-- | conf/distro/eneanfvaccess.conf | 2 | ||||
-rw-r--r-- | conf/template.atom-c3000/local.conf.sample | 2 | ||||
-rw-r--r-- | conf/template.qemux86-64/local.conf.sample | 2 | ||||
-rw-r--r-- | conf/template.xeon-d/local.conf.sample | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index 6026cf5..581528a 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf | |||
@@ -8,7 +8,7 @@ DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" | |||
8 | SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" | 8 | SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" |
9 | 9 | ||
10 | INHERIT += "distrooverrides" | 10 | INHERIT += "distrooverrides" |
11 | DISTRO_FEATURES_append = " odm" | 11 | DISTRO_FEATURES_append = " odm efi-secure-boot" |
12 | DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" | 12 | DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" |
13 | 13 | ||
14 | PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" | 14 | PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" |
diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index 544d279..8c24e77 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample | |||
@@ -244,6 +244,6 @@ SKIP_META_VIRT_SANITY_CHECK = "1" | |||
244 | 244 | ||
245 | SOTA_MACHINE ?= "${MACHINE}" | 245 | SOTA_MACHINE ?= "${MACHINE}" |
246 | 246 | ||
247 | DISTRO_FEATURES_append = " sota efi-secure-boot" | 247 | DISTRO_FEATURES_append = " sota" |
248 | DISTRO_FEATURES_NATIVE_append = " sota" | 248 | DISTRO_FEATURES_NATIVE_append = " sota" |
249 | INHERIT += " sota" | 249 | INHERIT += " sota" |
diff --git a/conf/template.qemux86-64/local.conf.sample b/conf/template.qemux86-64/local.conf.sample index 1583652..1e82bfa 100644 --- a/conf/template.qemux86-64/local.conf.sample +++ b/conf/template.qemux86-64/local.conf.sample | |||
@@ -237,3 +237,5 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" | |||
237 | CONF_VERSION = "1" | 237 | CONF_VERSION = "1" |
238 | 238 | ||
239 | SKIP_META_VIRT_SANITY_CHECK = "1" | 239 | SKIP_META_VIRT_SANITY_CHECK = "1" |
240 | |||
241 | DISTRO_FEATURES_remove = " efi-secure-boot" | ||
diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index 34f5890..3b1063e 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample | |||
@@ -245,6 +245,6 @@ SKIP_META_VIRT_SANITY_CHECK = "1" | |||
245 | 245 | ||
246 | SOTA_MACHINE ?= "${MACHINE}" | 246 | SOTA_MACHINE ?= "${MACHINE}" |
247 | 247 | ||
248 | DISTRO_FEATURES_append = " sota efi-secure-boot" | 248 | DISTRO_FEATURES_append = " sota" |
249 | DISTRO_FEATURES_NATIVE_append = " sota" | 249 | DISTRO_FEATURES_NATIVE_append = " sota" |
250 | INHERIT += " sota" | 250 | INHERIT += " sota" |