From patchwork Thu Mar 1 14:43:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: initscripts: Properly handle new timestamp format Date: Thu, 01 Mar 2012 14:43:14 -0000 From: Gary Thomas X-Patchwork-Id: 22535 Message-Id: <1330612994-26329-1-git-send-email-gary@mlbassoc.com> To: openembedded-core@lists.openembedded.org Recent changes have attempted to make consistant use of /etc/timestamp In particular 5aab665 initscripts: Make /etc/timestamp consistent again. 173a48f image.bbclass: Ensure timestamp matches format used in initscripts after recent changes This new format can cause problems as the value is too large for most [32 bit] machines. Work around this by only comparing the YYYYMMDD portion (which does fit in 32 bits). Also, the new format is not directly compatible with the 'date' command line, so it must be reformatted for use. Signed-off-by: Gary Thomas --- .../initscripts/initscripts-1.0/bootmisc.sh | 4 ++-- 1 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 20ec0a0..383de82 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh @@ -70,8 +70,8 @@ if test -e /etc/timestamp then SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M` read TIMESTAMP < /etc/timestamp - if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then - date -u $TIMESTAMP + if [ ${TIMESTAMP%????} -gt ${SYSTEMDATE%????} ]; then + date -u ${TIMESTAMP#????}${TIMESTAMP%????????} /etc/init.d/hwclock.sh stop fi fi