mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
772da6e948
commit
b3de8e18e2
@@ -5,7 +5,7 @@ LICENSE = "PD"
|
|||||||
LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234"
|
LIC_FILES_CHKSUM = "file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234"
|
||||||
DEPENDS = "tzcode-native"
|
DEPENDS = "tzcode-native"
|
||||||
|
|
||||||
PR = "r2"
|
PR = "r3"
|
||||||
|
|
||||||
inherit allarch
|
inherit allarch
|
||||||
|
|
||||||
@@ -93,12 +93,12 @@ pkg_postinst_${PN} () {
|
|||||||
echo "You have an invalid TIMEZONE setting in ${src}"
|
echo "You have an invalid TIMEZONE setting in ${src}"
|
||||||
echo "Your ${etc_lt} has been reset to Universal; enjoy!"
|
echo "Your ${etc_lt} has been reset to Universal; enjoy!"
|
||||||
tz="Universal"
|
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
|
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
|
# Packages primarily organized by directory with a major city
|
||||||
|
|||||||
Reference in New Issue
Block a user