base-files: profile: don't set TZ if /etc/TZ is present

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@altell.ru>
Acked-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/base-files/base-files/jornada6xx/profile b/recipes/base-files/base-files/jornada6xx/profile
index bff0f42..bd9e3e6 100755 (executable)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 ff0418f..6874e6c 100644 (file)
--- 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 02bd39b..abb8c97 100644 (file)
--- 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 = "r95"
+PR = "r96"
 LICENSE = "GPL"
 
 SRC_URI = " \