diff options
| author | Gary Thomas <gary@mlbassoc.com> | 2015-07-17 06:58:00 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-22 23:25:00 +0100 |
| commit | 2d310470d95f7b387dcde605e4691ee505fc3b4d (patch) | |
| tree | f227185786f9f0f840483a9c31d0e9777c1dd995 /meta | |
| parent | 9d4a88d003fd1a4c8864d1470473ea7c90f5e6d7 (diff) | |
| download | openembedded-core-2d310470d95f7b387dcde605e4691ee505fc3b4d.tar.gz openembedded-core-2d310470d95f7b387dcde605e4691ee505fc3b4d.tar.bz2 openembedded-core-2d310470d95f7b387dcde605e4691ee505fc3b4d.zip | |
*image.bbclass: Consolidate ROOTFS_POSTPROCESS_COMMANDs
Move ROOTFS_POSTPROCESS_COMMANDs from core-image.bbclass to
image.bbclass so that images built using just image.bbclass
will benefit from them. Without this change, an image built
using image.bbclass did not honor read-only-rootfs image feature.
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/core-image.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index a78f93405b..501456dba7 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -69,9 +69,3 @@ CORE_IMAGE_EXTRA_INSTALL ?= "" IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" inherit image - -# Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " - -# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled -ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 57aaf35552..e2995e2638 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -182,6 +182,12 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'deb # Enable postinst logging if debug-tweaks is enabled ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' +# Create /etc/timestamp during image construction to give a reasonably sane default time setting +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " + +# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' + # Write manifest IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest" ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " |