commit 4efdcecc10de3ae2acdc2fcfecb2c2671a5d667e
author Brad Bishop <bradleyb@fuzziesquirrel.com> Tue Sep 13 21:32:44 2016 -0400
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Wed Sep 14 21:20:55 2016 -0400
tree 6987d06db99c42f8dc45507cf8ba11e003760d42
parent 118a9163dad13dc6fa8050ebeadf4f37444b2b82

distro: Allow other layers to override distro conf

Enable other layers to optionally define a
conf/distro/include/${MACHINE}.conf to override distro
configuration.

Change-Id: I7bc34d4d0d89c0a6568f084c017cd7e9b964ced1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

conf/distro/openbmc-phosphor.conf

diff --git a/conf/distro/openbmc-phosphor.conf b/conf/distro/openbmc-phosphor.conf
index c890d36..b2d207e 100644
--- a/conf/distro/openbmc-phosphor.conf
+++ b/conf/distro/openbmc-phosphor.conf
@@ -39,3 +39,5 @@
 
 # TODO: openbmc/openbmc#12345 - Upgrade to pygobject-3.
 PREFERRED_VERSION_python-pygobject = "2.%"
+
+include conf/distro/include/${MACHINE}.inc