distro: Move location of distro conf override files
Ideally, a machine layer can be used with any distro.
openbmc-phosphor.conf allows defaults to be overriden by machine layers
through an include file at conf/distro/include/${MACHINE}.inc. If this
pattern is used by other distros, the per-machine overrides will be
picked up by all distros. Instead, move the override file to
conf/distro/include/openbmc-phosphor/${MACHINE}.inc so these overrides
will only apply when the openbmc-phosphor distro is used.
Change-Id: Id42f87b5e13839a960fd84f348b46c9a31a7c801
Signed-off-by: Rick Altherr <raltherr@google.com>
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf
index b2d207e..837269a 100644
--- a/meta-phosphor/conf/distro/openbmc-phosphor.conf
+++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf
@@ -40,4 +40,4 @@
# TODO: openbmc/openbmc#12345 - Upgrade to pygobject-3.
PREFERRED_VERSION_python-pygobject = "2.%"
-include conf/distro/include/${MACHINE}.inc
+include conf/distro/include/openbmc-phosphor/${MACHINE}.inc