mirror of
https://git.yoctoproject.org/poky
synced 2026-09-24 13:36:22 +02:00
tzdata: Clean up
* Whitespace and indentation clean up.
* Change shell variables from "${foo}" to "$foo".
* Remove "/*" from directories specified in FILES.
* Move RCONFLICTS:${PN} to the end of the recipe.
(From OE-Core rev: a698cc12ac2d5b26b2415e3d14739d3f51b89dd1)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt
committed by
Richard Purdie
Richard Purdie
parent
3550d29e9e
commit
6b70ea0443
@@ -4,37 +4,30 @@ DEPENDS = "tzcode-native"
|
||||
|
||||
inherit allarch
|
||||
|
||||
RCONFLICTS:${PN} = "timezones timezone-africa timezone-america timezone-antarctica \
|
||||
timezone-arctic timezone-asia timezone-atlantic \
|
||||
timezone-australia timezone-europe timezone-indian \
|
||||
timezone-iso3166.tab timezone-pacific timezone-zone.tab"
|
||||
|
||||
S = "${WORKDIR}"
|
||||
|
||||
DEFAULT_TIMEZONE ?= "Universal"
|
||||
INSTALL_TIMEZONE_FILE ?= "1"
|
||||
|
||||
TZONES= "africa antarctica asia australasia europe northamerica southamerica \
|
||||
TZONES = " \
|
||||
africa antarctica asia australasia europe northamerica southamerica \
|
||||
factory etcetera backward \
|
||||
"
|
||||
"
|
||||
# pacificnew
|
||||
|
||||
# "slim" is the default since 2020b
|
||||
# "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql
|
||||
ZIC_FMT ?= "slim"
|
||||
|
||||
do_compile () {
|
||||
for zone in ${TZONES}; do \
|
||||
${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \
|
||||
${S}/${zone} ; \
|
||||
${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \
|
||||
${S}/${zone} ; \
|
||||
${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \
|
||||
${S}/${zone} ; \
|
||||
do_compile() {
|
||||
for zone in ${TZONES}; do
|
||||
${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null ${S}/${zone}
|
||||
${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null ${S}/${zone}
|
||||
${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds ${S}/${zone}
|
||||
done
|
||||
}
|
||||
|
||||
do_install () {
|
||||
do_install() {
|
||||
install -d ${D}$exec_prefix ${D}${datadir}/zoneinfo
|
||||
cp -pPR ${WORKDIR}$exec_prefix ${D}${base_prefix}
|
||||
# libc is removing zoneinfo files from package
|
||||
@@ -59,65 +52,70 @@ do_install () {
|
||||
chown -R root:root ${D}
|
||||
}
|
||||
|
||||
pkg_postinst:${PN} () {
|
||||
pkg_postinst:${PN}() {
|
||||
etc_lt="$D${sysconfdir}/localtime"
|
||||
src="$D${sysconfdir}/timezone"
|
||||
|
||||
if [ -e ${src} ] ; then
|
||||
tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
|
||||
if [ -e "$src" ]; then
|
||||
tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "$src")
|
||||
fi
|
||||
|
||||
if [ ! -z "${tz}" -a ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then
|
||||
echo "You have an invalid TIMEZONE setting in ${src}"
|
||||
echo "Your ${etc_lt} has been reset to Universal; enjoy!"
|
||||
if [ ! -z "$tz" -a ! -e "$D${datadir}/zoneinfo/$tz" ]; then
|
||||
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}"
|
||||
echo "Updating $etc_lt with $D${datadir}/zoneinfo/$tz"
|
||||
if [ -L "$etc_lt" ]; then
|
||||
rm -f "$etc_lt"
|
||||
fi
|
||||
ln -s "${datadir}/zoneinfo/${tz}" "${etc_lt}"
|
||||
ln -s "${datadir}/zoneinfo/$tz" "$etc_lt"
|
||||
fi
|
||||
}
|
||||
|
||||
# Packages primarily organized by directory with a major city
|
||||
# in most time zones in the base package
|
||||
|
||||
# Packages are primarily organized by directory with a major city in most time
|
||||
# zones in the base package
|
||||
TZ_PACKAGES = " \
|
||||
tzdata-core tzdata-misc tzdata-posix tzdata-right tzdata-africa \
|
||||
tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
|
||||
tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
|
||||
tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
|
||||
"
|
||||
PACKAGES = "${TZ_PACKAGES} ${PN}"
|
||||
|
||||
FILES:tzdata-africa += "${datadir}/zoneinfo/Africa/*"
|
||||
FILES:tzdata-africa += "${datadir}/zoneinfo/Africa"
|
||||
|
||||
FILES:tzdata-americas += "${datadir}/zoneinfo/America/* \
|
||||
${datadir}/zoneinfo/US/* \
|
||||
${datadir}/zoneinfo/Brazil/* \
|
||||
${datadir}/zoneinfo/Canada/* \
|
||||
${datadir}/zoneinfo/Mexico/* \
|
||||
${datadir}/zoneinfo/Chile/*"
|
||||
FILES:tzdata-americas += " \
|
||||
${datadir}/zoneinfo/America \
|
||||
${datadir}/zoneinfo/US \
|
||||
${datadir}/zoneinfo/Brazil \
|
||||
${datadir}/zoneinfo/Canada \
|
||||
${datadir}/zoneinfo/Mexico \
|
||||
${datadir}/zoneinfo/Chile \
|
||||
"
|
||||
|
||||
FILES:tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*"
|
||||
FILES:tzdata-antarctica += "${datadir}/zoneinfo/Antarctica"
|
||||
|
||||
FILES:tzdata-arctic += "${datadir}/zoneinfo/Arctic/*"
|
||||
FILES:tzdata-arctic += "${datadir}/zoneinfo/Arctic"
|
||||
|
||||
FILES:tzdata-asia += "${datadir}/zoneinfo/Asia/* \
|
||||
${datadir}/zoneinfo/Indian/* \
|
||||
${datadir}/zoneinfo/Mideast/*"
|
||||
FILES:tzdata-asia += " \
|
||||
${datadir}/zoneinfo/Asia \
|
||||
${datadir}/zoneinfo/Indian \
|
||||
${datadir}/zoneinfo/Mideast \
|
||||
"
|
||||
|
||||
FILES:tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*"
|
||||
FILES:tzdata-atlantic += "${datadir}/zoneinfo/Atlantic"
|
||||
|
||||
FILES:tzdata-australia += "${datadir}/zoneinfo/Australia/*"
|
||||
FILES:tzdata-australia += "${datadir}/zoneinfo/Australia"
|
||||
|
||||
FILES:tzdata-europe += "${datadir}/zoneinfo/Europe/*"
|
||||
FILES:tzdata-europe += "${datadir}/zoneinfo/Europe"
|
||||
|
||||
FILES:tzdata-pacific += "${datadir}/zoneinfo/Pacific/*"
|
||||
FILES:tzdata-pacific += "${datadir}/zoneinfo/Pacific"
|
||||
|
||||
FILES:tzdata-posix += "${datadir}/zoneinfo/posix/*"
|
||||
FILES:tzdata-posix += "${datadir}/zoneinfo/posix"
|
||||
|
||||
FILES:tzdata-right += "${datadir}/zoneinfo/right/*"
|
||||
FILES:tzdata-right += "${datadir}/zoneinfo/right"
|
||||
|
||||
FILES:tzdata-misc += "${datadir}/zoneinfo/Cuba \
|
||||
FILES:tzdata-misc += " \
|
||||
${datadir}/zoneinfo/Cuba \
|
||||
${datadir}/zoneinfo/Egypt \
|
||||
${datadir}/zoneinfo/Eire \
|
||||
${datadir}/zoneinfo/Factory \
|
||||
@@ -134,7 +132,8 @@ FILES:tzdata-misc += "${datadir}/zoneinfo/Cuba \
|
||||
${datadir}/zoneinfo/Poland \
|
||||
${datadir}/zoneinfo/Portugal \
|
||||
${datadir}/zoneinfo/Singapore \
|
||||
${datadir}/zoneinfo/Turkey"
|
||||
${datadir}/zoneinfo/Turkey \
|
||||
"
|
||||
|
||||
FILES:tzdata-core += " \
|
||||
${sysconfdir}/localtime \
|
||||
@@ -194,9 +193,17 @@ FILES:tzdata-core += " \
|
||||
${datadir}/zoneinfo/zone.tab \
|
||||
${datadir}/zoneinfo/zone1970.tab \
|
||||
${datadir}/zoneinfo/iso3166.tab \
|
||||
${datadir}/zoneinfo/Etc/*"
|
||||
${datadir}/zoneinfo/Etc \
|
||||
"
|
||||
|
||||
CONFFILES:tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone"
|
||||
|
||||
ALLOW_EMPTY:${PN} = "1"
|
||||
|
||||
RDEPENDS:${PN} = "${TZ_PACKAGES}"
|
||||
RCONFLICTS:${PN} = " \
|
||||
timezones timezone-africa timezone-america timezone-antarctica \
|
||||
timezone-arctic timezone-asia timezone-atlantic timezone-australia \
|
||||
timezone-europe timezone-indian timezone-iso3166.tab timezone-pacific \
|
||||
timezone-zone.tab \
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user