[oe] [PATCH] base-files: profile: don't set TZ if /etc/TZ is present

[Khem Raj]

On (02/07/10 18:57), Roman I Khimov wrote:
> uClibc-based systems can have system-wide TZ in /etc/TZ, thus we shouldn't
> set TZ variable if it is present.
> 
> Signed-off-by: Roman I Khimov <khimov at altell.ru>

Acked-by: Khem Raj <raj.khem at gmail.com>

what all shells did you test it on.

> ---
>  recipes/base-files/base-files/jornada6xx/profile   |    2 +-
>  .../base-files/base-files/omap3-pandora/profile    |    2 +-
>  .../base-files/base-files/oplinux-uclibc/profile   |    2 +-
>  recipes/base-files/base-files/oplinux/profile      |    2 +-
>  recipes/base-files/base-files/profile              |    2 +-
>  recipes/base-files/base-files/shr/profile          |    2 +-
>  recipes/base-files/base-files_3.0.14.bb            |    2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/recipes/base-files/base-files/jornada6xx/profile b/recipes/base-files/base-files/jornada6xx/profile
> index bff0f42..bd9e3e6 100755
> --- a/recipes/base-files/base-files/jornada6xx/profile
> +++ b/recipes/base-files/base-files/jornada6xx/profile
> @@ -9,7 +9,7 @@ if [ "`id -u`" -eq 0 ]; then
>     PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin"
>  fi
>  
> -if [ ! -e /etc/localtime ]; then
> +if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
>  	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html
>  				# for an explanation of how to set this to your local timezone.
>  	export TZ
> diff --git a/recipes/base-files/base-files/omap3-pandora/profile b/recipes/base-files/base-files/omap3-pandora/profile
> index 5797535..99b6fce 100644
> --- a/recipes/base-files/base-files/omap3-pandora/profile
> +++ b/recipes/base-files/base-files/omap3-pandora/profile
> @@ -5,7 +5,7 @@ PATH="/usr/local/bin:/usr/bin:/bin"
>  EDITOR="/bin/vi"			# needed for packages like cron
>  test -z "$TERM" && TERM="vt100"	# Basic terminal capab. For screen etc.
>  
> -if [ ! -e /etc/localtime ]; then
> +if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
>  	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
>  				# for an explanation of how to set this to your local timezone.
>  	export TZ
> diff --git a/recipes/base-files/base-files/oplinux-uclibc/profile b/recipes/base-files/base-files/oplinux-uclibc/profile
> index f6ae329..5ad2967 100644
> --- a/recipes/base-files/base-files/oplinux-uclibc/profile
> +++ b/recipes/base-files/base-files/oplinux-uclibc/profile
> @@ -5,7 +5,7 @@ PATH="/usr/local/bin:/usr/bin:/bin"
>  EDITOR="/usr/bin/nano"	# needed for packages like cron
>  TERM="linux"		# Basic terminal capab. For screen etc.
>  
> -if [ ! -e /etc/localtime ]; then
> +if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
>  	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
>  				# for an explanation of how to set this to your local timezone.
>  	export TZ
> diff --git a/recipes/base-files/base-files/oplinux/profile b/recipes/base-files/base-files/oplinux/profile
> index f6ae329..5ad2967 100644
> --- a/recipes/base-files/base-files/oplinux/profile
> +++ b/recipes/base-files/base-files/oplinux/profile
> @@ -5,7 +5,7 @@ PATH="/usr/local/bin:/usr/bin:/bin"
>  EDITOR="/usr/bin/nano"	# needed for packages like cron
>  TERM="linux"		# Basic terminal capab. For screen etc.
>  
> -if [ ! -e /etc/localtime ]; then
> +if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
>  	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
>  				# for an explanation of how to set this to your local timezone.
>  	export TZ
> diff --git a/recipes/base-files/base-files/profile b/recipes/base-files/base-files/profile
> index b5ce69d..8f7f6b5 100644
> --- a/recipes/base-files/base-files/profile
> +++ b/recipes/base-files/base-files/profile
> @@ -5,7 +5,7 @@ PATH="/usr/local/bin:/usr/bin:/bin"
>  EDITOR="/bin/vi"			# needed for packages like cron
>  test -z "$TERM" && TERM="vt100"	# Basic terminal capab. For screen etc.
>  
> -if [ ! -e /etc/localtime ]; then
> +if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
>  	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
>  				# for an explanation of how to set this to your local timezone.
>  	export TZ
> diff --git a/recipes/base-files/base-files/shr/profile b/recipes/base-files/base-files/shr/profile
> index 05e8490..6e11e81 100644
> --- a/recipes/base-files/base-files/shr/profile
> +++ b/recipes/base-files/base-files/shr/profile
> @@ -5,7 +5,7 @@ PATH="/usr/local/bin:/usr/bin:/bin"
>  EDITOR="/bin/vi"			# needed for packages like cron
>  test -z "$TERM" && TERM="vt100"	# Basic terminal capab. For screen etc.
>  
> -if [ ! -e /etc/localtime ]; then
> +if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
>  	TZ="UTC"		# Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 
>  				# for an explanation of how to set this to your local timezone.
>  	export TZ
> diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb
> index 9801f8a..02bd39b 100644
> --- a/recipes/base-files/base-files_3.0.14.bb
> +++ b/recipes/base-files/base-files_3.0.14.bb
> @@ -1,7 +1,7 @@
>  DESCRIPTION = "Miscellaneous files for the base system."
>  SECTION = "base"
>  PRIORITY = "required"
> -PR = "r94"
> +PR = "r95"
>  LICENSE = "GPL"
>  
>  SRC_URI = " \
> -- 
> 1.5.6.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel