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>

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}"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
 INHERIT += "distrooverrides"
-DISTRO_FEATURES_append = " odm efi-secure-boot"
+DISTRO_FEATURES_append = " odm efi-secure-boot usrmerge"
 DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot"
 
 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 ?= " \
   ##OEROOT##/meta-secure-core/meta-signing-key \
   ##OEROOT##/meta-secure-core/meta-efi-secure-boot \
   ##OEROOT##/meta-enea-user-keys \
+  ##OEROOT##/meta-python2 \
   "
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"
 # Unfortunately, setting the variable below breaks the build, so do not set it
 # for now
 # USERADD_ERROR_DYNAMIC = "1"
+
+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 ?= " \
   ##OEROOT##/meta-secure-core/meta-signing-key \
   ##OEROOT##/meta-secure-core/meta-efi-secure-boot \
   ##OEROOT##/meta-enea-user-keys \
+  ##OEROOT##/meta-python2 \
   "
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"
 # Unfortunately, setting the variable below breaks the build, so do not set it
 # for now
 # USERADD_ERROR_DYNAMIC = "1"
+
+IMAGE_INSTALL += "dpdk"