diff options
| author | Rick Altherr <raltherr@google.com> | 2016-09-23 15:16:28 -0700 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-09-28 02:01:24 +0000 |
| commit | e4ca76bc075ed65e7d813dfdd31a500db02a31c1 (patch) | |
| tree | f5f4c26dea83666c0428b66e5e2d29dcf8a0a749 | |
| parent | ffb1c6793ff67ae0d1dada4220bb8fc8f564f05e (diff) | |
| download | talos-openbmc-e4ca76bc075ed65e7d813dfdd31a500db02a31c1.tar.gz talos-openbmc-e4ca76bc075ed65e7d813dfdd31a500db02a31c1.zip | |
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>
| -rw-r--r-- | meta-phosphor/conf/distro/openbmc-phosphor.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index b2d207e64..837269aa1 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -40,4 +40,4 @@ 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 +include conf/distro/include/openbmc-phosphor/${MACHINE}.inc |
