From d836be9740026b7fad1842a060e33baef0691e3c Mon Sep 17 00:00:00 2001 From: Xo Wang Date: Mon, 6 Feb 2017 17:05:49 -0800 Subject: 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 Change-Id: Id8c3c2d9cbab9cd5e1f0eff3674ad28084816da6 --- meta-phosphor/conf/distro/openbmc-phosphor.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/conf') 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 -- cgit v1.2.1