9 files changed, 25 insertions, 43 deletions

diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf
index ed7383e..070bbb8 100644
--- a/conf/distro/eneanfvaccess.conf
+++ b/conf/distro/eneanfvaccess.conf
@@ -7,14 +7,19 @@ DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}"
 
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
+# OSTree integration
+require ${@bb.utils.contains('SOTA_MACHINE', '${MACHINE}', 'conf/distro/sota.conf.inc', '', d)}
+
 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"
 PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
+# Override ESP mount path set by meta/conf/image-uefi.conf to align with meta-secure-core paths
+EFI_PREFIX_df-efi-secure-boot = "/boot/efi"
 SBFOLDER = "bootloader"
 
 HOSTTOOLS_append = " scp"
diff --git a/conf/layer.conf b/conf/layer.conf
index 7fec7c8..db496a4 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,3 +11,4 @@ BBFILE_COLLECTIONS += "el-nfv-access"
 BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/"
 BBFILE_PRIORITY_el-nfv-access = "7"
 LAYERDEPENDS_el-nfv-access = "nfv-access-common enea-virtualization"
+LAYERSERIES_COMPAT_el-nfv-access = "hardknott"
diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample
index 60e8955..b5e3f8c 100644
--- a/conf/template.atom-c3000-debug/local.conf.sample
+++ b/conf/template.atom-c3000-debug/local.conf.sample
@@ -155,6 +155,7 @@ EXTRA_IMAGE_FEATURES = " \
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+# NOTE: image-prelink is removed by sota.conf.inc
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
 #
@@ -241,16 +242,6 @@ CONF_VERSION = "1"
 
 SKIP_META_VIRT_SANITY_CHECK = "1"
 
-#
-# OSTree integration
-#
-
-SOTA_MACHINE ?= "${MACHINE}"
-
-DISTRO_FEATURES_append = " sota"
-DISTRO_FEATURES_NATIVE_append = " sota"
-INHERIT += " sota"
-
 # Various packages dynamically add users and groups to the system at package
 # install time.  For programs that do not care what the uid/gid is of the
 # resulting users/groups, the order of the install will determine the final
@@ -276,3 +267,6 @@ USERADD_GID_TABLES = "files/group"
 # Unfortunately, setting the variable below breaks the build, so do not set it
 # for now
 # USERADD_ERROR_DYNAMIC = "1"
+
+# to be removed together with python2 layer
+I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes"
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..558e110 100644
--- a/conf/template.atom-c3000/local.conf.sample
+++ b/conf/template.atom-c3000/local.conf.sample
@@ -152,6 +152,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+# NOTE: image-prelink is removed by sota.conf.inc
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
 #
@@ -238,16 +239,6 @@ CONF_VERSION = "1"
 
 SKIP_META_VIRT_SANITY_CHECK = "1"
 
-#
-# OSTree integration
-#
-
-SOTA_MACHINE ?= "${MACHINE}"
-
-DISTRO_FEATURES_append = " sota"
-DISTRO_FEATURES_NATIVE_append = " sota"
-INHERIT += " sota"
-
 # Various packages dynamically add users and groups to the system at package
 # install time.  For programs that do not care what the uid/gid is of the
 # resulting users/groups, the order of the install will determine the final
@@ -273,3 +264,6 @@ USERADD_GID_TABLES = "files/group"
 # Unfortunately, setting the variable below breaks the build, so do not set it
 # for now
 # USERADD_ERROR_DYNAMIC = "1"
+
+# to be removed together with python2 layer
+I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes"
diff --git a/conf/template.qemux86-64/bblayers.conf.sample b/conf/template.qemux86-64/bblayers.conf.sample
index ea5510a..214386c 100644
--- a/conf/template.qemux86-64/bblayers.conf.sample
+++ b/conf/template.qemux86-64/bblayers.conf.sample
@@ -21,6 +21,4 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-filesystems \
   ##OEROOT##/meta-openembedded/meta-python \
   ##OEROOT##/meta-openembedded/meta-webserver \
-  ##OEROOT##/meta-cloud-services \
-  ##OEROOT##/meta-cloud-services/meta-openstack \
   "
diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample
index 6474a37..e80ee61 100644
--- a/conf/template.xeon-d-debug/local.conf.sample
+++ b/conf/template.xeon-d-debug/local.conf.sample
@@ -156,6 +156,7 @@ EXTRA_IMAGE_FEATURES = " \
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+# NOTE: image-prelink is removed by sota.conf.inc
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
 #
@@ -242,16 +243,6 @@ CONF_VERSION = "1"
 
 SKIP_META_VIRT_SANITY_CHECK = "1"
 
-#
-# OSTree integration
-#
-
-SOTA_MACHINE ?= "${MACHINE}"
-
-DISTRO_FEATURES_append = " sota"
-DISTRO_FEATURES_NATIVE_append = " sota"
-INHERIT += " sota"
-
 # Various packages dynamically add users and groups to the system at package
 # install time.  For programs that do not care what the uid/gid is of the
 # resulting users/groups, the order of the install will determine the final
@@ -277,3 +268,6 @@ USERADD_GID_TABLES = "files/group"
 # Unfortunately, setting the variable below breaks the build, so do not set it
 # for now
 # USERADD_ERROR_DYNAMIC = "1"
+
+# to be removed together with python2 layer
+I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes"
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..2b10f27 100644
--- a/conf/template.xeon-d/local.conf.sample
+++ b/conf/template.xeon-d/local.conf.sample
@@ -153,6 +153,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
 #   - 'image-swab' to perform host system intrusion detection
 # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
 # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+# NOTE: image-prelink is removed by sota.conf.inc
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
 #
@@ -239,16 +240,6 @@ CONF_VERSION = "1"
 
 SKIP_META_VIRT_SANITY_CHECK = "1"
 
-#
-# OSTree integration
-#
-
-SOTA_MACHINE ?= "${MACHINE}"
-
-DISTRO_FEATURES_append = " sota"
-DISTRO_FEATURES_NATIVE_append = " sota"
-INHERIT += " sota"
-
 # Various packages dynamically add users and groups to the system at package
 # install time.  For programs that do not care what the uid/gid is of the
 # resulting users/groups, the order of the install will determine the final
@@ -274,3 +265,6 @@ USERADD_GID_TABLES = "files/group"
 # Unfortunately, setting the variable below breaks the build, so do not set it
 # for now
 # USERADD_ERROR_DYNAMIC = "1"
+
+# to be removed together with python2 layer
+I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes"