diff options
Diffstat (limited to 'meta-phosphor/conf')
| -rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-base.inc | 7 | ||||
| -rw-r--r-- | meta-phosphor/conf/layer.conf | 5 | ||||
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 8 |
3 files changed, 10 insertions, 10 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" diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf index 0df82a724..d35230656 100644 --- a/meta-phosphor/conf/layer.conf +++ b/meta-phosphor/conf/layer.conf @@ -8,10 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "phosphor-layer" BBFILE_PATTERN_phosphor-layer := "^${LAYERDIR}/" LAYERVERSION_phosphor-layer = "1" -LAYERSERIES_COMPAT_phosphor-layer = "thud warrior" - -# Provide a variable that points the base of the phosphor layer. -PHOSPHORBASE = '${@os.path.normpath("${LAYERDIR}/")}' +LAYERSERIES_COMPAT_phosphor-layer = "warrior zeus" IMAGE_FEATURES[validitems] += "tools-profile" diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index 7162b5d8d..4bafeafce 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -10,7 +10,7 @@ IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', \ 'mtd-ubi mtd-ubi-tar', \ 'mtd-static mtd-static-tar mtd-static-alltar', d)}" -INITRAMFS_CTYPE ?= "lzma" -INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}" -INITRAMFS_IMAGE ?= "obmc-phosphor-initramfs" -INITRAMFS_IMAGE_df-obmc-ubi-fs ?= "" +INITRAMFS_CTYPE ?= "xz" +INITRAMFS_FSTYPES = "cpio.${INITRAMFS_CTYPE}" +INITRAMFS_IMAGE = "obmc-phosphor-initramfs" +INITRAMFS_IMAGE_df-obmc-ubi-fs = "" |