From b3de8e18e29b8d87aafb3449f0e5cdf4292fb8b7 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 8 Feb 2013 14:52:19 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-extended/tzdata/tzdata_2012d.bb | 12 ++++++------ 1 file 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" LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234" DEPENDS = "tzcode-native" -PR = "r2" +PR = "r3" inherit allarch @@ -93,12 +93,12 @@ pkg_postinst_${PN} () { echo "You have an invalid TIMEZONE setting in ${src}" echo "Your ${etc_lt} has been reset to Universal; enjoy!" tz="Universal" + echo "Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz}" + if [ -L ${etc_lt} ] ; then + rm -f "${etc_lt}" + fi + cp -f "$D${datadir}/zoneinfo/${tz}" "${etc_lt}" fi - echo "Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz}" - if [ -L ${etc_lt} ] ; then - rm -f "${etc_lt}" - fi - cp -f "$D${datadir}/zoneinfo/${tz}" "${etc_lt}" } # Packages primarily organized by directory with a major city -- cgit v1.2.3-54-g00ecf