diff options
7 files changed, 4 insertions, 4 deletions
diff --git a/meta-google/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-google/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 76ec9a53ca..3e286f3faa 100644 --- a/meta-google/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-google/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,7 +1,6 @@ # Remove unneeded packages installed RDEPENDS:${PN}-extras:remove:gbmc = "obmc-ikvm" RDEPENDS:${PN}-extras:remove:gbmc = "phosphor-rest" -RDEPENDS:${PN}-extras:remove:gbmc = "phosphor-dbus-monitor" RDEPENDS:${PN}-extras:remove:gbmc = "phosphor-nslcd-cert-config" RDEPENDS:${PN}-extras:remove:gbmc = "phosphor-nslcd-authority-cert-config" diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 1da87110e7..cf4093f5de 100644 --- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -2,6 +2,8 @@ OBMC_IMAGE_EXTRA_INSTALL:append:ibm-ac-server = " mboxd max31785-msl phosphor-ms OBMC_IMAGE_EXTRA_INSTALL:append:p10bmc = " mboxd" OBMC_IMAGE_EXTRA_INSTALL:append:mihawk = " mboxd liberation-fonts uart-render-controller " +IMAGE_FEATURES:append = " obmc-dbus-monitor" + # remove so things fit in available flash space IMAGE_FEATURES:remove:witherspoon = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove:witherspoon = "obmc-telemetry" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend index 61c1b4b546..d8e0912ec3 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1,2 @@ OBMC_IMAGE_EXTRA_INSTALL:append:fp5280g2 = " mboxd liberation-fonts uart-render-controller first-boot-set-mac" +IMAGE_FEATURES:append:fp5280g2 = " obmc-dbus-monitor" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 494b06c7c7..f276e64399 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -10,7 +10,6 @@ IMAGE_FEATURES += " \ obmc-chassis-mgmt \ obmc-chassis-state-mgmt \ obmc-console \ - obmc-dbus-monitor \ obmc-devtools \ obmc-fan-control \ obmc-fan-mgmt \ diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 8fb72f2865..803ecf67f5 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -30,7 +30,6 @@ IMAGE_FEATURES:remove = "obmc-bmcweb" IMAGE_FEATURES:remove = "obmc-chassis-mgmt" IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt" IMAGE_FEATURES:remove = "obmc-console" -IMAGE_FEATURES:remove = "obmc-dbus-monitor" IMAGE_FEATURES:remove = "obmc-devtools" IMAGE_FEATURES:remove = "obmc-fan-control" IMAGE_FEATURES:remove = "obmc-fan-mgmt" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index ce58a91c34..90f6927dc7 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -25,7 +25,6 @@ IMAGE_FEATURES:remove = "obmc-bmcweb" IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt" IMAGE_FEATURES:remove = "obmc-chassis-mgmt" IMAGE_FEATURES:remove = "obmc-console" -IMAGE_FEATURES:remove = "obmc-dbus-monitor" IMAGE_FEATURES:remove = "obmc-devtools" IMAGE_FEATURES:remove = "obmc-fan-control" IMAGE_FEATURES:remove = "obmc-fan-mgmt" diff --git a/meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend index 3c1f006d8c..42c0f2a950 100644 --- a/meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-s6q/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1,2 @@ OBMC_IMAGE_EXTRA_INSTALL:append:s6q = " usb-ethernet-gadget" +IMAGE_FEATURES:append:s6q = " obmc-dbus-monitor" |