From 3729afeca5f86563b33c4939448f646e6fadfe42 Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Tue, 17 Jan 2023 17:18:53 -0500
Subject: [PATCH] Include machine-specific extra config if available

---
 conf/distro/hvmpd.conf | 5 +++++
 conf/layer.conf        | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/conf/distro/hvmpd.conf b/conf/distro/hvmpd.conf
index 57cd7ba..a155ac1 100644
--- a/conf/distro/hvmpd.conf
+++ b/conf/distro/hvmpd.conf
@@ -3,6 +3,11 @@ require conf/distro/poky.conf
 DISTRO = "hvmpd"
 DISTRO_NAME = "HV MPD distribution"
 
+# Use include instead of require as these are optional
+# depending on the particular machine:
+include raspberrypi/conf/machine/${MACHINE}-extra.conf
+include wandboard/conf/machine/${MACHINE}-extra.conf
+
 # Declare that we want to be treated like poky:
 DISTROOVERRIDES =. "poky:"
 
diff --git a/conf/layer.conf b/conf/layer.conf
index 1db3e66..eeb7d9e 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,3 +16,7 @@ BBFILE_PRIORITY_meta-hvmpd-distro = "11"
 
 LAYERDEPENDS_meta-hvmpd-distro = "core"
 LAYERSERIES_COMPAT_meta-hvmpd-distro = "kirkstone"
+
+# Add board-specific directories:
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.%s' % (layer, ext) \
+    for layer in '${BBFILE_COLLECTIONS}'.split() for ext in ['bb', 'bbappend'])}"
-- 
2.20.1