diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2021-03-24 11:58:07 +0100 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2021-03-25 12:27:30 +0100 |
commit | 5f980c14dafb466e1d71e0b6e7487aa522ade9f9 (patch) | |
tree | 0d58f2aea15998482c8baed3510964bfba292cfd /conf | |
parent | 23ed226a4b4b7c1cac2c52e6808631d9f0d6f652 (diff) | |
download | meta-el-nfv-access-5f980c14dafb466e1d71e0b6e7487aa522ade9f9.tar.gz |
Upgrade to gatesgarth
This is an initial commit, containing quick fixes and hacks to allow
building the images. All these issues will be re-evaluated and fixed
properly in their own commits.
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/eneanfvaccess.conf | 2 | ||||
-rw-r--r-- | conf/template.atom-c3000/bblayers.conf.sample | 1 | ||||
-rw-r--r-- | conf/template.atom-c3000/local.conf.sample | 2 | ||||
-rw-r--r-- | conf/template.xeon-d/bblayers.conf.sample | 1 | ||||
-rw-r--r-- | conf/template.xeon-d/local.conf.sample | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index ae26b2d..c31363d 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 efi-secure-boot" | 11 | DISTRO_FEATURES_append = " odm efi-secure-boot usrmerge" |
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/bblayers.conf.sample b/conf/template.atom-c3000/bblayers.conf.sample index 71c77cc..f5d25ce 100644 --- a/conf/template.atom-c3000/bblayers.conf.sample +++ b/conf/template.atom-c3000/bblayers.conf.sample | |||
@@ -28,4 +28,5 @@ BBLAYERS ?= " \ | |||
28 | ##OEROOT##/meta-secure-core/meta-signing-key \ | 28 | ##OEROOT##/meta-secure-core/meta-signing-key \ |
29 | ##OEROOT##/meta-secure-core/meta-efi-secure-boot \ | 29 | ##OEROOT##/meta-secure-core/meta-efi-secure-boot \ |
30 | ##OEROOT##/meta-enea-user-keys \ | 30 | ##OEROOT##/meta-enea-user-keys \ |
31 | ##OEROOT##/meta-python2 \ | ||
31 | " | 32 | " |
diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index b015f43..374cace 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample | |||
@@ -273,3 +273,5 @@ USERADD_GID_TABLES = "files/group" | |||
273 | # Unfortunately, setting the variable below breaks the build, so do not set it | 273 | # Unfortunately, setting the variable below breaks the build, so do not set it |
274 | # for now | 274 | # for now |
275 | # USERADD_ERROR_DYNAMIC = "1" | 275 | # USERADD_ERROR_DYNAMIC = "1" |
276 | |||
277 | IMAGE_INSTALL += "dpdk" | ||
diff --git a/conf/template.xeon-d/bblayers.conf.sample b/conf/template.xeon-d/bblayers.conf.sample index 71c77cc..f5d25ce 100644 --- a/conf/template.xeon-d/bblayers.conf.sample +++ b/conf/template.xeon-d/bblayers.conf.sample | |||
@@ -28,4 +28,5 @@ BBLAYERS ?= " \ | |||
28 | ##OEROOT##/meta-secure-core/meta-signing-key \ | 28 | ##OEROOT##/meta-secure-core/meta-signing-key \ |
29 | ##OEROOT##/meta-secure-core/meta-efi-secure-boot \ | 29 | ##OEROOT##/meta-secure-core/meta-efi-secure-boot \ |
30 | ##OEROOT##/meta-enea-user-keys \ | 30 | ##OEROOT##/meta-enea-user-keys \ |
31 | ##OEROOT##/meta-python2 \ | ||
31 | " | 32 | " |
diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index 5cfebf5..fd14580 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample | |||
@@ -274,3 +274,5 @@ USERADD_GID_TABLES = "files/group" | |||
274 | # Unfortunately, setting the variable below breaks the build, so do not set it | 274 | # Unfortunately, setting the variable below breaks the build, so do not set it |
275 | # for now | 275 | # for now |
276 | # USERADD_ERROR_DYNAMIC = "1" | 276 | # USERADD_ERROR_DYNAMIC = "1" |
277 | |||
278 | IMAGE_INSTALL += "dpdk" | ||