diff options
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 29 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 27 |
2 files changed, 27 insertions, 29 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 0e699eec4..079495b15 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -53,35 +53,6 @@ FEATURE_PACKAGES_obmc-user-mgmt ?= "packagegroup-obmc-apps-user-mgmt" # tree under phosphor-ipmi-host FEATURE_PACKAGES_obmc-net-ipmi_qemuall = "" -# Install entire Phosphor application stack by default -IMAGE_FEATURES += " \ - obmc-bmc-state-mgmt \ - obmc-chassis-mgmt \ - obmc-chassis-state-mgmt \ - obmc-fan-control \ - obmc-fan-mgmt \ - obmc-flash-mgmt \ - obmc-host-ctl \ - obmc-host-ipmi \ - obmc-host-state-mgmt \ - obmc-inventory \ - obmc-leds \ - obmc-logging-mgmt \ - obmc-remote-logging-mgmt \ - obmc-net-ipmi \ - obmc-sensors \ - obmc-software \ - obmc-system-mgmt \ - obmc-user-mgmt \ - ssh-server-dropbear \ - obmc-debug-collector \ - obmc-network-mgmt \ - obmc-settings-mgmt \ - " - -IMAGE_FEATURES_append_df-obmc-ubi-fs = " read-only-rootfs" -IMAGE_FEATURES_append_df-phosphor-mmc = " read-only-rootfs" - CORE_IMAGE_EXTRA_INSTALL_append = " bash \ packagegroup-obmc-apps-extras \ packagegroup-obmc-apps-extrasdevtools \ diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index dc7050ab6..ccd24beea 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -4,4 +4,31 @@ full OpenBMC feature set for devices of all types." IMAGE_LINGUAS = "" +IMAGE_FEATURES += " \ + obmc-bmc-state-mgmt \ + obmc-chassis-mgmt \ + obmc-chassis-state-mgmt \ + obmc-fan-control \ + obmc-fan-mgmt \ + obmc-flash-mgmt \ + obmc-host-ctl \ + obmc-host-ipmi \ + obmc-host-state-mgmt \ + obmc-inventory \ + obmc-leds \ + obmc-logging-mgmt \ + obmc-remote-logging-mgmt \ + obmc-net-ipmi \ + obmc-sensors \ + obmc-software \ + obmc-system-mgmt \ + obmc-user-mgmt \ + ssh-server-dropbear \ + obmc-debug-collector \ + obmc-network-mgmt \ + obmc-settings-mgmt \ + " +IMAGE_FEATURES_append_df-obmc-ubi-fs = " read-only-rootfs" +IMAGE_FEATURES_append_df-phosphor-mmc = " read-only-rootfs" + inherit obmc-phosphor-image |