diff options
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 10 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 12 |
2 files changed, 12 insertions, 10 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 079495b15..797aab087 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -69,21 +69,11 @@ CORE_IMAGE_EXTRA_INSTALL_append = " bash \ OBMC_IMAGE_EXTRA_INSTALL ?= "" -# The /etc/version file is misleading and not useful. Remove it. -# Users should instead rely on /etc/os-release. remove_etc_version() { rm ${IMAGE_ROOTFS}${sysconfdir}/version } -ROOTFS_POSTPROCESS_COMMAND += "remove_etc_version ; " -# Disable the pager to prevent systemd injecting control characters into the -# output stream that are not interpreted by busybox tools. disable_systemd_pager() { echo "SYSTEMD_PAGER=" >> ${IMAGE_ROOTFS}${sysconfdir}/profile echo "export SYSTEMD_PAGER" >> ${IMAGE_ROOTFS}${sysconfdir}/profile } -ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; " - -# 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-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index d224d70b0..9c0f87b3e 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -32,3 +32,15 @@ IMAGE_FEATURES += " \ " 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 ; " + +# Disable the pager to prevent systemd injecting control characters into the +# output stream that are not interpreted by busybox tools. +ROOTFS_POSTPROCESS_COMMAND += "disable_systemd_pager ; " + +# The shadow recipe provides the binaries(like useradd, usermod) needed by the +# phosphor-user-manager. +ROOTFS_RO_UNNEEDED_remove = "shadow" |