commit | 09cb1f3ba43a44881b9898ec359d4f8417f6c2bd | [log] [tgz] |
---|---|---|
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 | 2ec13ef5e5936ea1f55f8fc6545fe80274ede953 | |
parent | a6bd1e9970ed5f98a0cdbc8deac8d9ed69234349 [diff] |
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>
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index c890d36..b2d207e 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/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