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>

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index 20ec0a025dd66aa591a73267a37a56a76b869312..5b86e798b6e6852f8cf58d1fd95b33d9eea3282d 100755 (executable)
--- 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 e16f19f1ada3b7819f1bdeaf7ae8d858002f5d05..68701cee39037df26e33d582c519ab1baab7075b 100644 (file)
--- 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"