From a2cf914717dc0c70c6d2defb0bbdf7e69edc1c3e Mon Sep 17 00:00:00 2001
From: Christopher Larson <chris_larson@mentor.com>
Date: Thu, 28 Jul 2022 01:47:07 +0500
Subject: [PATCH] sokol-flex: adjust configuration for oe-selftest via distro
 feature

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 .../conf/distro/include/no_sanity_distros.inc        |  5 +++++
 meta-sokol-flex-distro/conf/distro/sokol-flex.conf   | 12 ++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 meta-sokol-flex-distro/conf/distro/include/no_sanity_distros.inc

diff --git a/meta-sokol-flex-distro/conf/distro/include/no_sanity_distros.inc b/meta-sokol-flex-distro/conf/distro/include/no_sanity_distros.inc
new file mode 100644
index 000000000..4f954791b
--- /dev/null
+++ b/meta-sokol-flex-distro/conf/distro/include/no_sanity_distros.inc
@@ -0,0 +1,5 @@
+python no_sanity_distros () {
+    if bb.utils.contains('DISTRO_FEATURES', 'selftest', True, False, d):
+        d.delVar('SANITY_TESTED_DISTROS')
+}
+addhandler no_sanity_distros
diff --git a/meta-sokol-flex-distro/conf/distro/sokol-flex.conf b/meta-sokol-flex-distro/conf/distro/sokol-flex.conf
index 41955dc18..54a4f4517 100644
--- a/meta-sokol-flex-distro/conf/distro/sokol-flex.conf
+++ b/meta-sokol-flex-distro/conf/distro/sokol-flex.conf
@@ -287,6 +287,18 @@ require classes/metadata_scm.bbclass
 METADATA_BRANCH := "${@base_detect_branch(d)}"
 METADATA_REVISION := "${@base_detect_revision(d)}"
 ## }}}1
+## OE Self Test {{{1
+# Use the expected dummy kernel
+PREFERRED_PROVIDER_virtual/kernel:feature-selftest = "linux-dummy"
+
+# Remove configuration items incompatible with oe-selftest
+INHERIT:remove:feature-selftest = "buildhistory rm_work"
+PRSERV_HOST:feature-selftest = ""
+
+# Selftest demands that this variable bit even exist in the metadata, so setting
+# to the empty string is insufficient
+require conf/distro/include/no_sanity_distros.inc
+## }}}1
 ## SDK & Application Development Environment {{{1
 # Use DEPLOY_DIR_ naming for consistency
 SDK_DEPLOY:sokol-flex = "${DEPLOY_DIR_SDK}"