diff options
| author | Xo Wang <xow@google.com> | 2017-02-06 17:05:49 -0800 |
|---|---|---|
| committer | Xo Wang <xow@google.com> | 2017-02-06 17:10:47 -0800 |
| commit | d836be9740026b7fad1842a060e33baef0691e3c (patch) | |
| tree | a4bf658ebfff18eb84f6aa9eea05c66127bbc856 /meta-phosphor/conf | |
| parent | 2a46570ced7a9d8d316522cbf68106bf8d6c3f24 (diff) | |
| download | talos-openbmc-d836be9740026b7fad1842a060e33baef0691e3c.tar.gz talos-openbmc-d836be9740026b7fad1842a060e33baef0691e3c.zip | |
meta-phosphor: Don't overwrite INHERIT in conf
INHERIT is being overwritten rather than appended to in
openbmc-phosphor.conf as of 0a544b5f874e81a1c4579d3de113c176668b6c80.
Use override append syntax for obmc-phosphor-utils and add a space to
separate from preceding classes.
Fixes openbmc/openbmc#1095.
Signed-off-by: Xo Wang <xow@google.com>
Change-Id: Id8c3c2d9cbab9cd5e1f0eff3674ad28084816da6
Diffstat (limited to 'meta-phosphor/conf')
| -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 2460e70c2..b32bb0462 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -50,6 +50,6 @@ DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel" # TODO: openbmc/openbmc#12345 - Upgrade to pygobject-3. PREFERRED_VERSION_python-pygobject = "2.%" -INHERIT = "obmc-phosphor-utils" +INHERIT_append = " obmc-phosphor-utils" include conf/distro/include/openbmc-phosphor/${MACHINE}.inc |
