From 2078af333d704fd894a2dedbc19cef5775cdadbb Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Thu, 4 Nov 2010 05:34:12 -0600 Subject: image.bbclass/initscripts: Make /etc/timestamp usage consistent. Timestamp is kept in UTC Remove superfluous 'create_etc_timestamp()' function - seems to be a duplicate of 'rootfs_update_timestamp()' Remove External function reference [sgw@linux.intel.com: merged 2 patches and cleanup commit message] Signed-off-by: Gary Thomas Signed-off-by: Saul Wold --- meta/classes/image.bbclass | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 3db34ac193..9fa0155c8a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -182,10 +182,6 @@ zap_root_password () { mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd } -create_etc_timestamp() { - date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp -} - # Turn any symbolic /sbin/init link into a file remove_init_link () { if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then @@ -217,7 +213,7 @@ set_image_autologin () { # Can be use to create /etc/timestamp during image construction to give a reasonably # sane default time setting rootfs_update_timestamp () { - date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp + date -u +%2m%2d%2H%2M%4Y >${IMAGE_ROOTFS}/etc/timestamp } # Prevent X from being started @@ -239,7 +235,7 @@ rootfs_trim_schemas () { } -# export the zap_root_password, create_etc_timestamp and remote_init_link -EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp rootfs_no_x_startup +# export the zap_root_password, and remote_init_link +EXPORT_FUNCTIONS zap_root_password remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp rootfs_no_x_startup addtask rootfs before do_build after do_install -- cgit v1.2.3-54-g00ecf