diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/images')
3 files changed, 21 insertions, 28 deletions
diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb index 38b1c2d426..1073951cee 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image-base.bb @@ -1,6 +1,4 @@ DESCRIPTION = "A basic OpenBMC image with no features enabled." - -IMAGE_LINGUAS = "" LICENSE = "Apache-2.0" inherit obmc-phosphor-image @@ -8,3 +6,5 @@ inherit obmc-phosphor-image # The /etc/version file is misleading and not useful. Remove it. # Users should instead rely on /etc/os-release. ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " + +IMAGE_LINGUAS = "" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index f276e64399..0806ada231 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -1,9 +1,15 @@ DESCRIPTION = "Image with Phosphor, a software stack for hardware management \ in devices with baseboard management controllers. The image supports the \ full OpenBMC feature set for devices of all types." +LICENSE = "Apache-2.0" -IMAGE_LINGUAS = "" +inherit obmc-phosphor-image +# The /etc/version file is misleading and not useful. Remove it. +# Users should instead rely on /etc/os-release. +ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " + +IMAGE_LINGUAS = "" IMAGE_FEATURES += " \ obmc-bmc-state-mgmt \ obmc-bmcweb \ @@ -39,15 +45,6 @@ IMAGE_FEATURES += " \ obmc-settings-mgmt \ obmc-telemetry \ " - -LICENSE = "Apache-2.0" - -inherit obmc-phosphor-image - -# The /etc/version file is misleading and not useful. Remove it. -# Users should instead rely on /etc/os-release. -ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " - # The shadow recipe provides the binaries(like useradd, usermod) needed by the # phosphor-user-manager. ROOTFS_RO_UNNEEDED:remove = "shadow" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb index 9df4432fe5..9b2e41690a 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-initramfs.bb @@ -1,30 +1,26 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ first 'init' program more efficiently." +LICENSE = "MIT" +# Needed for the set_user_group functions to succeed +DEPENDS += "shadow-native" -# Init scripts -INIT_PACKAGE = "obmc-phosphor-initfs" -INIT_PACKAGE:df-phosphor-mmc = "phosphor-mmc-init" +inherit core-image + +export IMAGE_BASENAME = "obmc-phosphor-initramfs" + +BAD_RECOMMENDATIONS += "busybox-syslog" PACKAGE_INSTALL = "${VIRTUAL-RUNTIME_base-utils} base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} ${INIT_PACKAGE}" +PACKAGE_INSTALL:remove = "shadow" +# Init scripts +INIT_PACKAGE = "obmc-phosphor-initfs" +INIT_PACKAGE:df-phosphor-mmc = "phosphor-mmc-init" # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "read-only-rootfs" - -export IMAGE_BASENAME = "obmc-phosphor-initramfs" IMAGE_LINGUAS = "" - -LICENSE = "MIT" - IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" -inherit core-image - IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" - -# Needed for the set_user_group functions to succeed -DEPENDS += "shadow-native" - -PACKAGE_INSTALL:remove = "shadow" PACKAGE_EXCLUDE = "shadow" -BAD_RECOMMENDATIONS += "busybox-syslog" |