Patchwork initscripts: Make /etc/timestamp consistent again.

login
register
mail settings
Submitter Gary Thomas
Date Feb. 10, 2012, 4:16 p.m.
Message ID <1328890565-8304-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/21137/
State Accepted
Commit 5aab6653c9afa05e7c1b3ccd6bd34aec05c2a6f8
Headers show

Comments

Gary Thomas - Feb. 10, 2012, 4:16 p.m.
Commit cc8695 changed the way timestamps were handled
and added some extra munging to be able to compare them
reliably.  This change makes the timestamp value the same
everywhere and simplifies how the check to set the system
clock based on the timestamp is done.

Also, if the value stored in /etc/timestamp is newer
[at all] than the current system time, set the system clock
from the stored value, down to the minute, not just the day.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 .../initscripts/initscripts-1.0/bootmisc.sh        |    4 ++--
 .../initscripts/initscripts-1.0/save-rtc.sh        |    2 +-
 meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
Lauri Hintsala - Feb. 24, 2012, 7:06 a.m.
On 02/10/2012 06:16 PM, Gary Thomas wrote:
> Commit cc8695 changed the way timestamps were handled
> and added some extra munging to be able to compare them
> reliably.  This change makes the timestamp value the same
> everywhere and simplifies how the check to set the system
> clock based on the timestamp is done.
>
> Also, if the value stored in /etc/timestamp is newer
> [at all] than the current system time, set the system clock
> from the stored value, down to the minute, not just the day.
>
> Signed-off-by: Gary Thomas<gary@mlbassoc.com>
> ---
>   .../initscripts/initscripts-1.0/bootmisc.sh        |    4 ++--
>   .../initscripts/initscripts-1.0/save-rtc.sh        |    2 +-
>   meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
>   3 files changed, 4 insertions(+), 4 deletions(-)


Hi Gary,

You should do the same changes to meta/classes/image.bbclass where the 
/etc/timestamp file is generated to filesystem image.

Regards,
Lauri Hintsala
Richard Purdie - Feb. 24, 2012, 10:26 a.m.
On Fri, 2012-02-24 at 09:06 +0200, Lauri Hintsala wrote:
> On 02/10/2012 06:16 PM, Gary Thomas wrote:
> > Commit cc8695 changed the way timestamps were handled
> > and added some extra munging to be able to compare them
> > reliably.  This change makes the timestamp value the same
> > everywhere and simplifies how the check to set the system
> > clock based on the timestamp is done.
> >
> > Also, if the value stored in /etc/timestamp is newer
> > [at all] than the current system time, set the system clock
> > from the stored value, down to the minute, not just the day.
> >
> > Signed-off-by: Gary Thomas<gary@mlbassoc.com>
> > ---
> >   .../initscripts/initscripts-1.0/bootmisc.sh        |    4 ++--
> >   .../initscripts/initscripts-1.0/save-rtc.sh        |    2 +-
> >   meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
> >   3 files changed, 4 insertions(+), 4 deletions(-)
> 
> 
> Hi Gary,
> 
> You should do the same changes to meta/classes/image.bbclass where the 
> /etc/timestamp file is generated to filesystem image.

Agreed, this is a nasty inconsistency. I've pushed a patch into master
which fixes this.

Cheers,

Richard
Saul Wold - Feb. 24, 2012, 6:31 p.m.
On 02/10/2012 08:16 AM, Gary Thomas wrote:
> Commit cc8695 changed the way timestamps were handled
> and added some extra munging to be able to compare them
> reliably.  This change makes the timestamp value the same
> everywhere and simplifies how the check to set the system
> clock based on the timestamp is done.
>
> Also, if the value stored in /etc/timestamp is newer
> [at all] than the current system time, set the system clock
> from the stored value, down to the minute, not just the day.
>
> Signed-off-by: Gary Thomas<gary@mlbassoc.com>
> ---
>   .../initscripts/initscripts-1.0/bootmisc.sh        |    4 ++--
>   .../initscripts/initscripts-1.0/save-rtc.sh        |    2 +-
>   meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
>   3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> index d9e8ffa..20ec0a0 100755
> --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> @@ -68,9 +68,9 @@ fi
>   /etc/init.d/hwclock.sh start
>   if test -e /etc/timestamp
>   then
> -	SYSTEMDATE=`date -u +%4Y%2m%2d`
> +	SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
>   	read TIMESTAMP<  /etc/timestamp
> -	if [ ${TIMESTAMP#????????}${TIMESTAMP%????????} -gt $SYSTEMDATE ]; then
> +	if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
>   		date -u $TIMESTAMP
>   		/etc/init.d/hwclock.sh stop
>   	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 3d8e850..1f804e2 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 @@
>   ### END INIT INFO
>
>   # Update the timestamp
> -date -u +%2m%2d%2H%2M%4Y>  /etc/timestamp
> +date -u +%4Y%2m%2d%2H%2M>  /etc/timestamp
> diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
> index 203c605..b56c55c 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 = "r129"
> +PR = "r130"
>
>   INHIBIT_DEFAULT_DEPS = "1"
>

Merged into OE-core

Thanks
	Sau!
James Limbouris - Feb. 29, 2012, 5:31 a.m.
Hi,

I think we need to add BUSYBOX_CONFIG_FEATURE_TEST_64 to the busybox defconfig after this patch.
On my build (which had neither BUSYBOX_CONFIG_FEATURE_TEST_64 nor BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64) I was getting 'out of range' errors.
  
Regards 
James Limbouris

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf
> Of Saul Wold
> Sent: Saturday, 25 February 2012 2:31 AM
> To: Patches and discussions about the oe-core layer
> Subject: Re: [OE-core] [PATCH] initscripts: Make /etc/timestamp consistent
> again.
> 
> On 02/10/2012 08:16 AM, Gary Thomas wrote:
> > Commit cc8695 changed the way timestamps were handled
> > and added some extra munging to be able to compare them
> > reliably.  This change makes the timestamp value the same
> > everywhere and simplifies how the check to set the system
> > clock based on the timestamp is done.
> >
> > Also, if the value stored in /etc/timestamp is newer
> > [at all] than the current system time, set the system clock
> > from the stored value, down to the minute, not just the day.
> >
> > Signed-off-by: Gary Thomas<gary@mlbassoc.com>
> > ---
> >   .../initscripts/initscripts-1.0/bootmisc.sh        |    4 ++--
> >   .../initscripts/initscripts-1.0/save-rtc.sh        |    2 +-
> >   meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
> >   3 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> > index d9e8ffa..20ec0a0 100755
> > --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> > +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> > @@ -68,9 +68,9 @@ fi
> >   /etc/init.d/hwclock.sh start
> >   if test -e /etc/timestamp
> >   then
> > -	SYSTEMDATE=`date -u +%4Y%2m%2d`
> > +	SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
> >   	read TIMESTAMP<  /etc/timestamp
> > -	if [ ${TIMESTAMP#????????}${TIMESTAMP%????????} -gt
> $SYSTEMDATE ]; then
> > +	if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
> >   		date -u $TIMESTAMP
> >   		/etc/init.d/hwclock.sh stop
> >   	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 3d8e850..1f804e2 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 @@
> >   ### END INIT INFO
> >
> >   # Update the timestamp
> > -date -u +%2m%2d%2H%2M%4Y>  /etc/timestamp
> > +date -u +%4Y%2m%2d%2H%2M>  /etc/timestamp
> > diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-
> core/initscripts/initscripts_1.0.bb
> > index 203c605..b56c55c 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 = "r129"
> > +PR = "r130"
> >
> >   INHIBIT_DEFAULT_DEPS = "1"
> >
> 
> Merged into OE-core
> 
> Thanks
> 	Sau!
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
James Limbouris - Feb. 29, 2012, 6:34 a.m.
Also, CONFIG_FEATURE_DATE_COMPAT=y has to be removed - it mungs the YYYYMMddhhmm string into hhmmYYYYMMdd !

> -----Original Message-----
> From: James Limbouris
> Sent: Wednesday, 29 February 2012 1:32 PM
> To: Patches and discussions about the oe-core layer
> Subject: RE: [OE-core] [PATCH] initscripts: Make /etc/timestamp consistent
> again.
> 
> Hi,
> 
> I think we need to add BUSYBOX_CONFIG_FEATURE_TEST_64 to the
> busybox defconfig after this patch.
> On my build (which had neither BUSYBOX_CONFIG_FEATURE_TEST_64 nor
> BUSYBOX_CONFIG_EXPR_MATH_SUPPORT_64) I was getting 'out of range'
> errors.
> 
> Regards
> James Limbouris
> 
> > -----Original Message-----
> > From: openembedded-core-bounces@lists.openembedded.org
> > [mailto:openembedded-core-bounces@lists.openembedded.org] On
> Behalf
> > Of Saul Wold
> > Sent: Saturday, 25 February 2012 2:31 AM
> > To: Patches and discussions about the oe-core layer
> > Subject: Re: [OE-core] [PATCH] initscripts: Make /etc/timestamp consistent
> > again.
> >
> > On 02/10/2012 08:16 AM, Gary Thomas wrote:
> > > Commit cc8695 changed the way timestamps were handled
> > > and added some extra munging to be able to compare them
> > > reliably.  This change makes the timestamp value the same
> > > everywhere and simplifies how the check to set the system
> > > clock based on the timestamp is done.
> > >
> > > Also, if the value stored in /etc/timestamp is newer
> > > [at all] than the current system time, set the system clock
> > > from the stored value, down to the minute, not just the day.
> > >
> > > Signed-off-by: Gary Thomas<gary@mlbassoc.com>
> > > ---
> > >   .../initscripts/initscripts-1.0/bootmisc.sh        |    4 ++--
> > >   .../initscripts/initscripts-1.0/save-rtc.sh        |    2 +-
> > >   meta/recipes-core/initscripts/initscripts_1.0.bb   |    2 +-
> > >   3 files changed, 4 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> > b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> > > index d9e8ffa..20ec0a0 100755
> > > --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> > > +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
> > > @@ -68,9 +68,9 @@ fi
> > >   /etc/init.d/hwclock.sh start
> > >   if test -e /etc/timestamp
> > >   then
> > > -	SYSTEMDATE=`date -u +%4Y%2m%2d`
> > > +	SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
> > >   	read TIMESTAMP<  /etc/timestamp
> > > -	if [ ${TIMESTAMP#????????}${TIMESTAMP%????????} -gt
> > $SYSTEMDATE ]; then
> > > +	if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
> > >   		date -u $TIMESTAMP
> > >   		/etc/init.d/hwclock.sh stop
> > >   	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 3d8e850..1f804e2 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 @@
> > >   ### END INIT INFO
> > >
> > >   # Update the timestamp
> > > -date -u +%2m%2d%2H%2M%4Y>  /etc/timestamp
> > > +date -u +%4Y%2m%2d%2H%2M>  /etc/timestamp
> > > diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb
> b/meta/recipes-
> > core/initscripts/initscripts_1.0.bb
> > > index 203c605..b56c55c 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 = "r129"
> > > +PR = "r130"
> > >
> > >   INHIBIT_DEFAULT_DEPS = "1"
> > >
> >
> > Merged into OE-core
> >
> > Thanks
> > 	Sau!
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
index d9e8ffa..20ec0a0 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh
@@ -68,9 +68,9 @@  fi
 /etc/init.d/hwclock.sh start
 if test -e /etc/timestamp
 then
-	SYSTEMDATE=`date -u +%4Y%2m%2d`
+	SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M`
 	read TIMESTAMP < /etc/timestamp
-	if [ ${TIMESTAMP#????????}${TIMESTAMP%????????} -gt $SYSTEMDATE ]; then
+	if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then
 		date -u $TIMESTAMP
 		/etc/init.d/hwclock.sh stop
 	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 3d8e850..1f804e2 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 @@ 
 ### END INIT INFO
 
 # Update the timestamp
-date -u +%2m%2d%2H%2M%4Y > /etc/timestamp
+date -u +%4Y%2m%2d%2H%2M > /etc/timestamp
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 203c605..b56c55c 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 = "r129"
+PR = "r130"
 
 INHIBIT_DEFAULT_DEPS = "1"