summaryrefslogtreecommitdiff
path: root/meta-phosphor/conf/distro/include/phosphor-base.inc
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2019-10-22 23:54:16 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2019-10-22 23:54:16 +0300
commit9722c6ee87766a45a337c094d1293de81cdcb106 (patch)
tree08b57716ae3c02fef2bc870b634019e692fd70e6 /meta-phosphor/conf/distro/include/phosphor-base.inc
parent35e295e2a161fcf146ea031de53431b2888521fa (diff)
parent5b6cc97bf138293b6af12d5d3003bb66c700c48a (diff)
downloadopenbmc-9722c6ee87766a45a337c094d1293de81cdcb106.tar.xz
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
Diffstat (limited to 'meta-phosphor/conf/distro/include/phosphor-base.inc')
-rw-r--r--meta-phosphor/conf/distro/include/phosphor-base.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index b6f155122..2a9301d76 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -134,6 +134,9 @@ KERNEL_FEATURES_append = " phosphor-gpio-keys"
KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys"
IMAGE_CLASSES_append = " image_types_phosphor"
+IMAGE_CLASSES_append_npcm7xx = " image_types_phosphor_nuvoton"
+
+IMAGE_INSTALL_append = " dbus-broker"
# OpenBMC uses a couple recipes from meta-virtualization
# but we do not actually want any virtualization support
@@ -144,8 +147,8 @@ SKIP_META_VIRT_SANITY_CHECK = "1"
# Skip the udev database by default. It adds around 2MB
# compressed to the root filesystem, and probably doesn't
# make sense on a BMC anyway.
-BAD_RECOMMENDATIONS_pn-obmc-phosphor-image = "udev-hwdb"
-BAD_RECOMMENDATIONS_pn-obmc-phosphor-image += "shared-mime-info"
+BAD_RECOMMENDATIONS += "udev-hwdb"
+BAD_RECOMMENDATIONS += "shared-mime-info"
LAYER_CONF_VERSION ?= "8"