diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-02-08 14:52:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-14 23:17:59 +0000 |
commit | 789d5772a2525b1a13e5a8f3a951cfbc101acfbd (patch) | |
tree | 9f70ec661bb08a38ac6b4e4ab65d4d86d654716c /meta | |
parent | 444b6e1cd8f49e010560dfdb5d17c4eef03ffe9e (diff) | |
download | poky-789d5772a2525b1a13e5a8f3a951cfbc101acfbd.tar.gz |
tzdata: We shouldn't override the localtime if it is valid
The code where mistakenly replacing the localtime file setting so we
end with a copy of file instead of a symbolic link. This fixes it so
now, we'll only do that in case the link is pointing to invalid data.
Change-Id: I16dfa5ea4f293c48bb396f4e23a2ea53e6c9e745
(From OE-Core rev: a9b42c8e85332a65788b1434f926186d4887b287)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/tzdata/tzdata_2012d.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-extended/tzdata/tzdata_2012d.bb b/meta/recipes-extended/tzdata/tzdata_2012d.bb index 974110172f..9ec6715bc3 100644 --- a/meta/recipes-extended/tzdata/tzdata_2012d.bb +++ b/meta/recipes-extended/tzdata/tzdata_2012d.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "PD" | |||
5 | LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" | 5 | LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" |
6 | DEPENDS = "tzcode-native" | 6 | DEPENDS = "tzcode-native" |
7 | 7 | ||
8 | PR = "r2" | 8 | PR = "r3" |
9 | 9 | ||
10 | inherit allarch | 10 | inherit allarch |
11 | 11 | ||
@@ -93,12 +93,12 @@ pkg_postinst_${PN} () { | |||
93 | echo "You have an invalid TIMEZONE setting in ${src}" | 93 | echo "You have an invalid TIMEZONE setting in ${src}" |
94 | echo "Your ${etc_lt} has been reset to Universal; enjoy!" | 94 | echo "Your ${etc_lt} has been reset to Universal; enjoy!" |
95 | tz="Universal" | 95 | tz="Universal" |
96 | echo "Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz}" | ||
97 | if [ -L ${etc_lt} ] ; then | ||
98 | rm -f "${etc_lt}" | ||
99 | fi | ||
100 | cp -f "$D${datadir}/zoneinfo/${tz}" "${etc_lt}" | ||
96 | fi | 101 | fi |
97 | echo "Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz}" | ||
98 | if [ -L ${etc_lt} ] ; then | ||
99 | rm -f "${etc_lt}" | ||
100 | fi | ||
101 | cp -f "$D${datadir}/zoneinfo/${tz}" "${etc_lt}" | ||
102 | } | 102 | } |
103 | 103 | ||
104 | # Packages primarily organized by directory with a major city | 104 | # Packages primarily organized by directory with a major city |