diff options
author | Gary Thomas <gary@mlbassoc.com> | 2010-11-04 05:34:12 -0600 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2010-11-14 21:08:22 -0800 |
commit | 2078af333d704fd894a2dedbc19cef5775cdadbb (patch) | |
tree | 263946bffe2aec49662ed1151cb3552b0834c913 /meta/recipes-core | |
parent | 85bd3d644a5b8711f5ebee9c71ceaf278a02dbb5 (diff) | |
download | poky-2078af333d704fd894a2dedbc19cef5775cdadbb.tar.gz |
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 <gary@mlbassoc.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core')
-rwxr-xr-x | meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 8 | ||||
-rw-r--r-- | meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index 162df2b87e..03fd67c67e 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | |||
@@ -65,13 +65,13 @@ fi | |||
65 | # If the timestamp is 1 day or more recent than the current time, | 65 | # If the timestamp is 1 day or more recent than the current time, |
66 | # use the timestamp instead. | 66 | # use the timestamp instead. |
67 | /etc/init.d/hwclock.sh start | 67 | /etc/init.d/hwclock.sh start |
68 | if test -e /etc/timestamp2 | 68 | if test -e /etc/timestamp |
69 | then | 69 | then |
70 | SYSTEMDATE=`date "+%Y%m%d%2H%2M"` | 70 | SYSTEMDATE=`date -u +%2m%2d%2H%2M%4Y` |
71 | read TIMESTAMP < /etc/timestamp2 | 71 | read TIMESTAMP < /etc/timestamp |
72 | NEEDUPDATE=`expr \( $TIMESTAMP \> $SYSTEMDATE + 10000 \)` | 72 | NEEDUPDATE=`expr \( $TIMESTAMP \> $SYSTEMDATE + 10000 \)` |
73 | if [ $NEEDUPDATE -eq 1 ]; then | 73 | if [ $NEEDUPDATE -eq 1 ]; then |
74 | date -s $TIMESTAMP | 74 | date -u $TIMESTAMP |
75 | /etc/init.d/hwclock.sh stop | 75 | /etc/init.d/hwclock.sh stop |
76 | fi | 76 | fi |
77 | fi | 77 | fi |
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh index 75e43001b8..77aa11c36c 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh | |||
@@ -10,4 +10,4 @@ | |||
10 | ### END INIT INFO | 10 | ### END INIT INFO |
11 | 11 | ||
12 | # Update the timestamp | 12 | # Update the timestamp |
13 | date +%Y%m%d%2H%2M > /etc/timestamp2 | 13 | date -u +%2m%2d%2H%2M%4Y > /etc/timestamp |