summaryrefslogtreecommitdiff
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:14:47 +0000
commit7aa4c51089cc4a2811bd11842647839d1e4b1e95 (patch)
tree8057fe87b6a0dd45ef875df249b9cd8dc90c14ba
parentf32b30ef4711fe602a11549f77be06a0eef2fc0d (diff)
downloadopenembedded-core-7aa4c51089cc4a2811bd11842647839d1e4b1e95.tar.gz
openembedded-core-7aa4c51089cc4a2811bd11842647839d1e4b1e95.tar.bz2
openembedded-core-7aa4c51089cc4a2811bd11842647839d1e4b1e95.tar.xz
openembedded-core-7aa4c51089cc4a2811bd11842647839d1e4b1e95.zip
initscripts: Properly format date when set from timestamp
Reformat date, as stored in /etc/timestamp, to match CLI format. 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 20ec0a025..5b86e798b 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
SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
read TIMESTAMP < /etc/timestamp
if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
- date -u $TIMESTAMP
+ date -u ${TIMESTAMP#????}${TIMESTAMP%????????}
/etc/init.d/hwclock.sh stop
fi
fi
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index e16f19f1a..68701cee3 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
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r131"
+PR = "r132"
INHIBIT_DEFAULT_DEPS = "1"