diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-phosphor/conf/distro | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-phosphor/conf/distro')
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-base.inc | 14 | ||||
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-mmc.inc | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 8d53c8dda..93b24550c 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -8,6 +8,8 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" +DISTROOVERRIDES .= ":openbmc-phosphor" + POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "packagegroup-core-device-devel",d)}" DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}" @@ -93,7 +95,6 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = " \ " DISTRO_FEATURES_OBMC = " \ - ipmi-fru \ obmc-host-ctl \ obmc-host-ipmi \ obmc-phosphor-chassis-mgmt \ @@ -106,8 +107,6 @@ DISTRO_FEATURES_DEFAULT = " \ avahi \ ipv4 \ ipv6 \ - ldap \ - libc-inet-anl \ pam \ slp \ systemd \ @@ -124,9 +123,6 @@ MACHINE_FEATURES += " \ 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/openbmc-phosphor/${MACHINE}.inc KERNEL_FEATURES_append = " phosphor-gpio-keys" @@ -146,3 +142,9 @@ BAD_RECOMMENDATIONS += "shared-mime-info" LAYER_CONF_VERSION ?= "8" KERNEL_CLASSES_append = " obmc-phosphor-kernel-version" + +# Some packages have directory trees of YAML files arranged based on +# canonical organization names. 'xyz/openbmc_project' should be used +# everywhere in phosphor, but some layers may append this with their +# own organization(s). +OBMC_ORG_YAML_SUBDIRS += " xyz/openbmc_project" diff --git a/meta-phosphor/conf/distro/include/phosphor-mmc.inc b/meta-phosphor/conf/distro/include/phosphor-mmc.inc new file mode 100644 index 000000000..05d79c71f --- /dev/null +++ b/meta-phosphor/conf/distro/include/phosphor-mmc.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "phosphor-mmc" +DISTROOVERRIDES .= ":df-phosphor-mmc" |