From 4834bbecf7070611dab6f66c876d371a7d9aee7e Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Thu, 16 May 2019 18:39:20 +0200 Subject: Implement efi-secure-boot as distro feature override This will allow us to override variables depending on this distro feature more easily. Make Secure Boot related changes apply only efi-secure-boot distro feature is enabled. This will avoid any errors when building without the feature enabled. Change-Id: If07256977a647386cd43c5940357a0dedc95f95d Signed-off-by: Adrian Dudau --- conf/distro/eneanfvaccess.conf | 2 +- images/enea-nfv-access-host-common.inc | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index a84e1a4..6026cf5 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -9,7 +9,7 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" INHERIT += "distrooverrides" DISTRO_FEATURES_append = " odm" -DISTRO_FEATURES_OVERRIDES += "odm" +DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc index 53cf7ad..e552168 100644 --- a/images/enea-nfv-access-host-common.inc +++ b/images/enea-nfv-access-host-common.inc @@ -1,7 +1,13 @@ -require images/enea-nfv-access-common.inc -require classes/override_grub-efi.inc -require classes/override_image_types_ostree.inc -require images/secure-boot.inc +REQUIRE_FILES = " \ + images/enea-nfv-access-common.inc \ + classes/override_grub-efi.inc \ + " +REQUIRE_FILES_append_df-efi-secure-boot = " \ + classes/override_image_types_ostree.inc \ + images/secure-boot.inc \ + " + +require ${REQUIRE_FILES} IMAGE_INSTALL += " \ packagegroup-enea-virtualization-host \ -- cgit v1.2.3-54-g00ecf