phosphor-base: All images should use dbus-broker

All of our images use systemd for booting, so we should deploy
dbus-broker everywhere.

(From meta-phosphor rev: f8196005aefa15dd249ff72036f717b629c8bd4e)

Change-Id: I3010e367a79d782db31050979f5f1bdd30944a11
Signed-off-by: William A. Kennington III <wak@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index b6f1551..9351afa 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -135,6 +135,8 @@
 
 IMAGE_CLASSES_append = " image_types_phosphor"
 
+IMAGE_INSTALL_append = " dbus-broker"
+
 # OpenBMC uses a couple recipes from meta-virtualization
 # but we do not actually want any virtualization support
 # enabled on a BMC distribution.  Silence the emitted
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 96a65c1..4951848 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -45,7 +45,6 @@
         obmc-ikvm \
         phosphor-dbus-monitor \
         phosphor-systemd-policy \
-        dbus-broker \
         "
 
 SUMMARY_${PN}-extrasdev = "Development features"