summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2019-05-16 18:39:20 +0200
committerMartin Borg <martin.borg@enea.com>2019-05-23 14:51:11 +0200
commit4834bbecf7070611dab6f66c876d371a7d9aee7e (patch)
tree0d40b823cc888a0923d1f2d4dece09a5b1d05ce1
parentc5d2f06184f551225aad5bf1366058d161c92192 (diff)
downloadmeta-el-nfv-access-4834bbecf7070611dab6f66c876d371a7d9aee7e.tar.gz
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 <adrian.dudau@enea.com>
-rw-r--r--conf/distro/eneanfvaccess.conf2
-rw-r--r--images/enea-nfv-access-host-common.inc14
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')}"
9 9
10INHERIT += "distrooverrides" 10INHERIT += "distrooverrides"
11DISTRO_FEATURES_append = " odm" 11DISTRO_FEATURES_append = " odm"
12DISTRO_FEATURES_OVERRIDES += "odm" 12DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot"
13 13
14PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" 14PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
15PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" 15PREFERRED_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 @@
1require images/enea-nfv-access-common.inc 1REQUIRE_FILES = " \
2require classes/override_grub-efi.inc 2 images/enea-nfv-access-common.inc \
3require classes/override_image_types_ostree.inc 3 classes/override_grub-efi.inc \
4require images/secure-boot.inc 4 "
5REQUIRE_FILES_append_df-efi-secure-boot = " \
6 classes/override_image_types_ostree.inc \
7 images/secure-boot.inc \
8 "
9
10require ${REQUIRE_FILES}
5 11
6IMAGE_INSTALL += " \ 12IMAGE_INSTALL += " \
7 packagegroup-enea-virtualization-host \ 13 packagegroup-enea-virtualization-host \