summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-02-08 14:52:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-01 15:38:48 (GMT)
commitb3de8e18e29b8d87aafb3449f0e5cdf4292fb8b7 (patch)
tree80034b97ddc5278af44a6ca5eb259c41940e142d
parent772da6e948f22ebca4c925972678e4ab498b8a09 (diff)
downloadpoky-b3de8e18e29b8d87aafb3449f0e5cdf4292fb8b7.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: 9e7980a88e1604b21138d1999a04e471e07edfe3) 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>
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2012d.bb12
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 9741101..9ec6715 100644
--- a/meta/recipes-extended/tzdata/tzdata_2012d.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2012d.bb
@@ -5,7 +5,7 @@ LICENSE = "PD"
5LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" 5LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234"
6DEPENDS = "tzcode-native" 6DEPENDS = "tzcode-native"
7 7
8PR = "r2" 8PR = "r3"
9 9
10inherit allarch 10inherit 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