summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2014-07-23 17:29:28 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-25 15:33:59 +0100
commite2bd60a50c7235b5b31960015cb37dbd81f639d4 (patch)
treed0214e54762a000f2671c931ed572ee6473b6b82
parent35f3f10001675211e930adb312443f195257ce7a (diff)
downloadpoky-e2bd60a50c7235b5b31960015cb37dbd81f639d4.tar.gz
base-files: Don't export TZ if /etc/TZ exists
While glibc/eglibc looks for the time zone in /etc/localtime, other libc alternatives (e.g. uclibc) may look for it in /etc/TZ. If /etc/TZ exists, don't fall back to setting TZ to "UTC" in /etc/profile. (From OE-Core rev: a69c3ba99be1502c50d3d1eb9ff66f135884ed76) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Ben Shelton <ben.shelton@ni.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/base-files/base-files/profile2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile
index 8eeaac3693..0b2d9d79e5 100644
--- a/meta/recipes-core/base-files/base-files/profile
+++ b/meta/recipes-core/base-files/base-files/profile
@@ -5,7 +5,7 @@ PATH="/usr/local/bin:/usr/bin:/bin"
5EDITOR="/bin/vi" # needed for packages like cron 5EDITOR="/bin/vi" # needed for packages like cron
6test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. 6test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc.
7 7
8if [ ! -e /etc/localtime ]; then 8if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then
9 TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html 9 TZ="UTC" # Time Zone. Look at http://theory.uwinnipeg.ca/gnu/glibc/libc_303.html
10 # for an explanation of how to set this to your local timezone. 10 # for an explanation of how to set this to your local timezone.
11 export TZ 11 export TZ