summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2012-03-01 10:41:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 23:16:43 +0000
commit8b07ab0cead787fda4e5ab5fd7928404877bc6dc (patch)
tree8016bcb0c811518aa14fce1731d75474beb355db
parent1abce24c1f4300c319b8a06e2d1002bf5fcef775 (diff)
downloadpoky-8b07ab0cead787fda4e5ab5fd7928404877bc6dc.tar.gz
initscripts: Properly format date when set from timestamp
Reformat date, as stored in /etc/timestamp, to match CLI format. (From OE-Core rev: 7aa4c51089cc4a2811bd11842647839d1e4b1e95) Signed-off-by: Gary Thomas <gary@mlbassoc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh2
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 20ec0a025d..5b86e798b6 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -71,7 +71,7 @@ then
71 SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M` 71 SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
72 read TIMESTAMP < /etc/timestamp 72 read TIMESTAMP < /etc/timestamp
73 if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then 73 if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
74 date -u $TIMESTAMP 74 date -u ${TIMESTAMP#????}${TIMESTAMP%????????}
75 /etc/init.d/hwclock.sh stop 75 /etc/init.d/hwclock.sh stop
76 fi 76 fi
77fi 77fi
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index e16f19f1ad..68701cee39 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
3SECTION = "base" 3SECTION = "base"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6PR = "r131" 6PR = "r132"
7 7
8INHIBIT_DEFAULT_DEPS = "1" 8INHIBIT_DEFAULT_DEPS = "1"
9 9