From 6180ad6f231100df6c0f7615cba74b0c44f8aaef Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Mon, 8 Jul 2019 13:37:32 +0200 Subject: Move efi-secure-boot feature to nfvaccess distro definition Change-Id: Ia9944b2ed8fad4a32984443b5ef98f287904c0d8 Signed-off-by: Adrian Dudau --- conf/distro/eneanfvaccess.conf | 2 +- conf/template.atom-c3000/local.conf.sample | 2 +- conf/template.qemux86-64/local.conf.sample | 2 ++ 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}" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" INHERIT += "distrooverrides" -DISTRO_FEATURES_append = " odm" +DISTRO_FEATURES_append = " odm efi-secure-boot" DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" 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" SOTA_MACHINE ?= "${MACHINE}" -DISTRO_FEATURES_append = " sota efi-secure-boot" +DISTRO_FEATURES_append = " sota" DISTRO_FEATURES_NATIVE_append = " sota" 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" CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" + +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" SOTA_MACHINE ?= "${MACHINE}" -DISTRO_FEATURES_append = " sota efi-secure-boot" +DISTRO_FEATURES_append = " sota" DISTRO_FEATURES_NATIVE_append = " sota" INHERIT += " sota" -- cgit v1.2.3-54-g00ecf