summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2016-09-13 21:32:44 -0400
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2016-09-14 21:20:55 -0400
commit09cb1f3ba43a44881b9898ec359d4f8417f6c2bd (patch)
tree2ec13ef5e5936ea1f55f8fc6545fe80274ede953
parenta6bd1e9970ed5f98a0cdbc8deac8d9ed69234349 (diff)
downloadtalos-openbmc-09cb1f3ba43a44881b9898ec359d4f8417f6c2bd.tar.gz
talos-openbmc-09cb1f3ba43a44881b9898ec359d4f8417f6c2bd.zip
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>
-rw-r--r--meta-phosphor/conf/distro/openbmc-phosphor.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf
index c890d36ce..b2d207e64 100644
--- a/meta-phosphor/conf/distro/openbmc-phosphor.conf
+++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf
@@ -39,3 +39,5 @@ DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel"
# TODO: openbmc/openbmc#12345 - Upgrade to pygobject-3.
PREFERRED_VERSION_python-pygobject = "2.%"
+
+include conf/distro/include/${MACHINE}.inc
OpenPOWER on IntegriCloud