summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2015-07-17 06:58:00 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-23 08:48:39 +0100
commit6e78cc4fad881d36a158495f1e1a03bd7d3f006a (patch)
tree48209ad696740cf1ea30f7e64233eb1d27b9a8bb
parent061d6ecfcdf42d890fec4ca709a88a909c35a757 (diff)
downloadpoky-6e78cc4fad881d36a158495f1e1a03bd7d3f006a.tar.gz
*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. (From OE-Core rev: 2d310470d95f7b387dcde605e4691ee505fc3b4d) 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>
-rw-r--r--meta/classes/core-image.bbclass6
-rw-r--r--meta/classes/image.bbclass6
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 ?= ""
69IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" 69IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
70 70
71inherit image 71inherit image
72
73# Create /etc/timestamp during image construction to give a reasonably sane default time setting
74ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
75
76# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled
77ROOTFS_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
182# Enable postinst logging if debug-tweaks is enabled 182# Enable postinst logging if debug-tweaks is enabled
183ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}' 183ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains_any("IMAGE_FEATURES", [ 'debug-tweaks', 'post-install-logging' ], "postinst_enable_logging; ", "",d)}'
184 184
185# Create /etc/timestamp during image construction to give a reasonably sane default time setting
186ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
187
188# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled
189ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}'
190
185# Write manifest 191# Write manifest
186IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest" 192IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest"
187ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " 193ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; "