1 files changed, 176 insertions, 182 deletions
diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb
index f8443110d5..dd1960ffa7 100644
--- a/meta/recipes-extended/timezone/tzdata.bb
+++ b/meta/recipes-extended/timezone/tzdata.bb
@@ -4,207 +4,201 @@ 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 = " \
-         factory etcetera backward \
+    africa antarctica asia australasia europe northamerica southamerica \
-        "
+    factory etcetera backward \
-# pacificnew 
+"
-do_compile () {
+# "slim" is the default since 2020b
-        for zone in ${TZONES}; do \
+# "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql
-            ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \
+ZIC_FMT ?= "slim"
-                ${S}/${zone} ; \
-            ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \
+do_configure[cleandirs] = "${B}"
-                ${S}/${zone} ; \
+B = "${WORKDIR}/build"
-            ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \
-                ${S}/${zone} ; \
+do_compile() {
-        done
+        for zone in ${TZONES}; do
+                ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone}
+                ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone}
+                ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/right -L ${S}/leapseconds ${S}/${zone}
+        done
 }
-do_install () {
+do_install() {
-        install -d ${D}/$exec_prefix ${D}${datadir}/zoneinfo
+        install -d ${D}${datadir}/zoneinfo
-        cp -pPR ${S}/$exec_prefix ${D}/
+        cp -pPR ${B}/zoneinfo/* ${D}${datadir}/zoneinfo
-        # libc is removing zoneinfo files from package
-        cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo
+        # libc is removing zoneinfo files from package
-        cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo
+        cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo
-        cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo
+        cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo
-        cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo
+        cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo
-        cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo
+        cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo
+        cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo
-        # Install default timezone
-        if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then
+        # Install default timezone
-            install -d ${D}${sysconfdir}
+        if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then
-            if [ "${INSTALL_TIMEZONE_FILE}" = "1" ]; then
+                install -d ${D}${sysconfdir}
-                echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone
+                if [ "${INSTALL_TIMEZONE_FILE}" = "1" ]; then
-            fi
+                        echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone
-            ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime
+                fi
-        else
+                ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime
-            bberror "DEFAULT_TIMEZONE is set to an invalid value."
+        else
-            exit 1
+                bberror "DEFAULT_TIMEZONE is set to an invalid value."
-        fi
+                exit 1
+        fi
-        chown -R root:root ${D}
+        chown -R root:root ${D}
 }
-pkg_postinst_${PN} () {
+pkg_postinst:${PN}() {
        etc_lt="$D${sysconfdir}/localtime"
        src="$D${sysconfdir}/timezone"
-        if [ -e ${src} ] ; then
+        if [ -e "$src" ]; then
-                tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
+                tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "$src")
        fi
-        if [ ! -z "${tz}" -a ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then
+        if [ ! -z "$tz" -a ! -e "$D${datadir}/zoneinfo/$tz" ]; then
-                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"
-                echo "Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz}"
+                echo "Updating $etc_lt with $D${datadir}/zoneinfo/$tz"
-                if [ -L ${etc_lt} ] ; then
+                if [ -L "$etc_lt" ]; then
-                        rm -f "${etc_lt}"
+                        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
+# Packages are primarily organized by directory with a major city in most time
-# in most time zones in the base package
+# 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"
-RPROVIDES_tzdata-africa = "tzdata-africa"
+FILES:tzdata-americas += " \
-FILES_tzdata-americas += "${datadir}/zoneinfo/America/*  \
+    ${datadir}/zoneinfo/America \
-                ${datadir}/zoneinfo/US/*                \
+    ${datadir}/zoneinfo/US \
-                ${datadir}/zoneinfo/Brazil/*            \
+    ${datadir}/zoneinfo/Brazil \
-                ${datadir}/zoneinfo/Canada/*            \
+    ${datadir}/zoneinfo/Canada \
-                ${datadir}/zoneinfo/Mexico/*            \
+    ${datadir}/zoneinfo/Mexico \
-                ${datadir}/zoneinfo/Chile/*"
+    ${datadir}/zoneinfo/Chile \
-RPROVIDES_tzdata-americas = "tzdata-americas"
+"
-FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*"
+FILES:tzdata-antarctica += "${datadir}/zoneinfo/Antarctica"
-RPROVIDES_tzdata-antarctica = "tzdata-antarctica"
+FILES:tzdata-arctic += "${datadir}/zoneinfo/Arctic"
-FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*"
-RPROVIDES_tzdata-arctic = "tzdata-arctic"
+FILES:tzdata-asia += " \
+    ${datadir}/zoneinfo/Asia \
-FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/*        \
+    ${datadir}/zoneinfo/Indian \
-                ${datadir}/zoneinfo/Indian/*            \
+    ${datadir}/zoneinfo/Mideast \
-                ${datadir}/zoneinfo/Mideast/*"
+"
-RPROVIDES_tzdata-asia = "tzdata-asia"
+FILES:tzdata-atlantic += "${datadir}/zoneinfo/Atlantic"
-FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*"
-RPROVIDES_tzdata-atlantic = "tzdata-atlantic"
+FILES:tzdata-australia += "${datadir}/zoneinfo/Australia"
-FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*"
+FILES:tzdata-europe += "${datadir}/zoneinfo/Europe"
-RPROVIDES_tzdata-australia = "tzdata-australia"
+FILES:tzdata-pacific += "${datadir}/zoneinfo/Pacific"
-FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*"
-RPROVIDES_tzdata-europe = "tzdata-europe"
+FILES:tzdata-posix += "${datadir}/zoneinfo/posix"
-FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*"
+FILES:tzdata-right += "${datadir}/zoneinfo/right"
-RPROVIDES_tzdata-pacific = "tzdata-pacific"
+FILES:tzdata-misc += " \
-FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*"
+    ${datadir}/zoneinfo/Cuba \
-RPROVIDES_tzdata-posix = "tzdata-posix"
+    ${datadir}/zoneinfo/Egypt \
+    ${datadir}/zoneinfo/Eire \
-FILES_tzdata-right += "${datadir}/zoneinfo/right/*"
+    ${datadir}/zoneinfo/Factory \
-RPROVIDES_tzdata-right = "tzdata-right"
+    ${datadir}/zoneinfo/GB-Eire \
+    ${datadir}/zoneinfo/Hongkong \
-FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba           \
+    ${datadir}/zoneinfo/Iceland \
-                ${datadir}/zoneinfo/Egypt                \
+    ${datadir}/zoneinfo/Iran \
-                ${datadir}/zoneinfo/Eire                 \
+    ${datadir}/zoneinfo/Israel \
-                ${datadir}/zoneinfo/Factory              \
+    ${datadir}/zoneinfo/Jamaica \
-                ${datadir}/zoneinfo/GB-Eire              \
+    ${datadir}/zoneinfo/Japan \
-                ${datadir}/zoneinfo/Hongkong             \
+    ${datadir}/zoneinfo/Kwajalein \
-                ${datadir}/zoneinfo/Iceland              \
+    ${datadir}/zoneinfo/Libya \
-                ${datadir}/zoneinfo/Iran                 \
+    ${datadir}/zoneinfo/Navajo \
-                ${datadir}/zoneinfo/Israel               \
+    ${datadir}/zoneinfo/Poland \
-                ${datadir}/zoneinfo/Jamaica              \
+    ${datadir}/zoneinfo/Portugal \
-                ${datadir}/zoneinfo/Japan                \
+    ${datadir}/zoneinfo/Singapore \
-                ${datadir}/zoneinfo/Kwajalein            \
+    ${datadir}/zoneinfo/Turkey \
-                ${datadir}/zoneinfo/Libya                \
+"
-                ${datadir}/zoneinfo/Navajo               \
-                ${datadir}/zoneinfo/Poland               \
+FILES:tzdata-core += " \
-                ${datadir}/zoneinfo/Portugal             \
+    ${sysconfdir}/localtime \
-                ${datadir}/zoneinfo/Singapore            \
+    ${sysconfdir}/timezone \
-                ${datadir}/zoneinfo/Turkey"
+    ${datadir}/zoneinfo/leapseconds \
-RPROVIDES_tzdata-misc = "tzdata-misc"
+    ${datadir}/zoneinfo/leap-seconds.list \
+    ${datadir}/zoneinfo/Pacific/Honolulu \
-FILES_tzdata-core += " \
+    ${datadir}/zoneinfo/America/Anchorage \
-                ${sysconfdir}/localtime                  \
+    ${datadir}/zoneinfo/America/Los_Angeles \
-                ${sysconfdir}/timezone                   \
+    ${datadir}/zoneinfo/America/Denver \
-                ${datadir}/zoneinfo/leapseconds          \
+    ${datadir}/zoneinfo/America/Chicago \
-                ${datadir}/zoneinfo/leap-seconds.list    \
+    ${datadir}/zoneinfo/America/New_York \
-                ${datadir}/zoneinfo/Pacific/Honolulu     \
+    ${datadir}/zoneinfo/America/Caracas \
-                ${datadir}/zoneinfo/America/Anchorage    \
+    ${datadir}/zoneinfo/America/Sao_Paulo \
-                ${datadir}/zoneinfo/America/Los_Angeles  \
+    ${datadir}/zoneinfo/Europe/London \
-                ${datadir}/zoneinfo/America/Denver       \
+    ${datadir}/zoneinfo/Europe/Paris \
-                ${datadir}/zoneinfo/America/Chicago      \
+    ${datadir}/zoneinfo/Africa/Cairo \
-                ${datadir}/zoneinfo/America/New_York     \
+    ${datadir}/zoneinfo/Europe/Moscow \
-                ${datadir}/zoneinfo/America/Caracas      \
+    ${datadir}/zoneinfo/Asia/Dubai \
-                ${datadir}/zoneinfo/America/Sao_Paulo    \
+    ${datadir}/zoneinfo/Asia/Karachi \
-                ${datadir}/zoneinfo/Europe/London        \
+    ${datadir}/zoneinfo/Asia/Dhaka \
-                ${datadir}/zoneinfo/Europe/Paris         \
+    ${datadir}/zoneinfo/Asia/Bangkok \
-                ${datadir}/zoneinfo/Africa/Cairo         \
+    ${datadir}/zoneinfo/Asia/Hong_Kong \
-                ${datadir}/zoneinfo/Europe/Moscow        \
+    ${datadir}/zoneinfo/Asia/Tokyo \
-                ${datadir}/zoneinfo/Asia/Dubai           \
+    ${datadir}/zoneinfo/Australia/Darwin \
-                ${datadir}/zoneinfo/Asia/Karachi         \
+    ${datadir}/zoneinfo/Australia/Adelaide \
-                ${datadir}/zoneinfo/Asia/Dhaka           \
+    ${datadir}/zoneinfo/Australia/Brisbane \
-                ${datadir}/zoneinfo/Asia/Bangkok         \
+    ${datadir}/zoneinfo/Australia/Sydney \
-                ${datadir}/zoneinfo/Asia/Hong_Kong       \
+    ${datadir}/zoneinfo/Pacific/Noumea \
-                ${datadir}/zoneinfo/Asia/Tokyo           \
+    ${datadir}/zoneinfo/CET \
-                ${datadir}/zoneinfo/Australia/Darwin     \
+    ${datadir}/zoneinfo/CST6CDT \
-                ${datadir}/zoneinfo/Australia/Adelaide   \
+    ${datadir}/zoneinfo/EET \
-                ${datadir}/zoneinfo/Australia/Brisbane   \
+    ${datadir}/zoneinfo/EST \
-                ${datadir}/zoneinfo/Australia/Sydney     \
+    ${datadir}/zoneinfo/EST5EDT \
-                ${datadir}/zoneinfo/Pacific/Noumea       \
+    ${datadir}/zoneinfo/GB \
-                ${datadir}/zoneinfo/CET                  \
+    ${datadir}/zoneinfo/GMT \
-                ${datadir}/zoneinfo/CST6CDT              \
+    ${datadir}/zoneinfo/GMT+0 \
-                ${datadir}/zoneinfo/EET                  \
+    ${datadir}/zoneinfo/GMT-0 \
-                ${datadir}/zoneinfo/EST                  \
+    ${datadir}/zoneinfo/GMT0 \
-                ${datadir}/zoneinfo/EST5EDT              \
+    ${datadir}/zoneinfo/Greenwich \
-                ${datadir}/zoneinfo/GB                   \
+    ${datadir}/zoneinfo/HST \
-                ${datadir}/zoneinfo/GMT                  \
+    ${datadir}/zoneinfo/MET \
-                ${datadir}/zoneinfo/GMT+0                \
+    ${datadir}/zoneinfo/MST \
-                ${datadir}/zoneinfo/GMT-0                \
+    ${datadir}/zoneinfo/MST7MDT \
-                ${datadir}/zoneinfo/GMT0                 \
+    ${datadir}/zoneinfo/NZ \
-                ${datadir}/zoneinfo/Greenwich            \
+    ${datadir}/zoneinfo/NZ-CHAT \
-                ${datadir}/zoneinfo/HST                  \
+    ${datadir}/zoneinfo/PRC \
-                ${datadir}/zoneinfo/MET                  \
+    ${datadir}/zoneinfo/PST8PDT \
-                ${datadir}/zoneinfo/MST                  \
+    ${datadir}/zoneinfo/ROC \
-                ${datadir}/zoneinfo/MST7MDT              \
+    ${datadir}/zoneinfo/ROK \
-                ${datadir}/zoneinfo/NZ                   \
+    ${datadir}/zoneinfo/UCT \
-                ${datadir}/zoneinfo/NZ-CHAT              \
+    ${datadir}/zoneinfo/UTC \
-                ${datadir}/zoneinfo/PRC                  \
+    ${datadir}/zoneinfo/Universal \
-                ${datadir}/zoneinfo/PST8PDT              \
+    ${datadir}/zoneinfo/W-SU \
-                ${datadir}/zoneinfo/ROC                  \
+    ${datadir}/zoneinfo/WET \
-                ${datadir}/zoneinfo/ROK                  \
+    ${datadir}/zoneinfo/Zulu \
-                ${datadir}/zoneinfo/UCT                  \
+    ${datadir}/zoneinfo/zone.tab \
-                ${datadir}/zoneinfo/UTC                  \
+    ${datadir}/zoneinfo/zone1970.tab \
-                ${datadir}/zoneinfo/Universal            \
+    ${datadir}/zoneinfo/iso3166.tab \
-                ${datadir}/zoneinfo/W-SU                 \
+    ${datadir}/zoneinfo/Etc \
-                ${datadir}/zoneinfo/WET                  \
+"
-                ${datadir}/zoneinfo/Zulu                 \
-                ${datadir}/zoneinfo/zone.tab             \
+CONFFILES:tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone"
-                ${datadir}/zoneinfo/zone1970.tab         \
-                ${datadir}/zoneinfo/iso3166.tab          \
+ALLOW_EMPTY:${PN} = "1"
-                ${datadir}/zoneinfo/Etc/*"
+RDEPENDS:${PN} = "${TZ_PACKAGES}"
-CONFFILES_tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone"
-ALLOW_EMPTY_${PN} = "1"
-RDEPENDS_${PN} = "${TZ_PACKAGES}"

diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index f8443110d5..dd1960ffa7 100644 --- a/meta/recipes-extended/timezone/tzdata.bb +++ b/meta/recipes-extended/timezone/tzdata.bb
@@ -4,207 +4,201 @@ DEPENDS = "tzcode-native"
4		4
5	inherit allarch	5	inherit allarch
6		6
7	RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarctica \
8	timezone-arctic timezone-asia timezone-atlantic \
9	timezone-australia timezone-europe timezone-indian \
10	timezone-iso3166.tab timezone-pacific timezone-zone.tab"
11
12	S = "${WORKDIR}"
13
14	DEFAULT_TIMEZONE ?= "Universal"	7	DEFAULT_TIMEZONE ?= "Universal"
15	INSTALL_TIMEZONE_FILE ?= "1"	8	INSTALL_TIMEZONE_FILE ?= "1"
16		9
17	TZONES= "africa antarctica asia australasia europe northamerica southamerica \	10	TZONES = " \
18	factory etcetera backward \	11	africa antarctica asia australasia europe northamerica southamerica \
19	"	12	factory etcetera backward \
20	# pacificnew	13	"
21		14
22	do_compile () {	15	# "slim" is the default since 2020b
23	for zone in ${TZONES}; do \	16	# "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql
24	${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \	17	ZIC_FMT ?= "slim"
25	${S}/${zone} ; \	18
26	${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \	19	do_configure[cleandirs] = "${B}"
27	${S}/${zone} ; \	20	B = "${WORKDIR}/build"
28	${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \	21
29	${S}/${zone} ; \	22	do_compile() {
30	done	23	for zone in ${TZONES}; do
		24	${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone}
		25	${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone}
		26	${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/right -L ${S}/leapseconds ${S}/${zone}
		27	done
31	}	28	}
32		29
33	do_install () {	30	do_install() {
34	install -d ${D}/$exec_prefix ${D}${datadir}/zoneinfo	31	install -d ${D}${datadir}/zoneinfo
35	cp -pPR ${S}/$exec_prefix ${D}/	32	cp -pPR ${B}/zoneinfo/* ${D}${datadir}/zoneinfo
36	# libc is removing zoneinfo files from package	33
37	cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo	34	# libc is removing zoneinfo files from package
38	cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo	35	cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo
39	cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo	36	cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo
40	cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo	37	cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo
41	cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo	38	cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo
42		39	cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo
43	# Install default timezone	40
44	if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then	41	# Install default timezone
45	install -d ${D}${sysconfdir}	42	if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then
46	if [ "${INSTALL_TIMEZONE_FILE}" = "1" ]; then	43	install -d ${D}${sysconfdir}
47	echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone	44	if [ "${INSTALL_TIMEZONE_FILE}" = "1" ]; then
48	fi	45	echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone
49	ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime	46	fi
50	else	47	ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime
51	bberror "DEFAULT_TIMEZONE is set to an invalid value."	48	else
52	exit 1	49	bberror "DEFAULT_TIMEZONE is set to an invalid value."
53	fi	50	exit 1
54		51	fi
55	chown -R root:root ${D}	52
		53	chown -R root:root ${D}
56	}	54	}
57		55
58	pkg_postinst_${PN} () {	56	pkg_postinst:${PN}() {
59	etc_lt="$D${sysconfdir}/localtime"	57	etc_lt="$D${sysconfdir}/localtime"
60	src="$D${sysconfdir}/timezone"	58	src="$D${sysconfdir}/timezone"
61		59
62	if [ -e ${src} ] ; then	60	if [ -e "$src" ]; then
63	tz=$(sed -e 's:#.::' -e 's:[[:space:]]::g' -e '/^$/d' "${src}")	61	tz=$(sed -e 's:#.::' -e 's:[[:space:]]::g' -e '/^$/d' "$src")
64	fi	62	fi
65		63
66	if [ ! -z "${tz}" -a ! -e "$D${datadir}/zoneinfo/${tz}" ] ; then	64	if [ ! -z "$tz" -a ! -e "$D${datadir}/zoneinfo/$tz" ]; then
67	echo "You have an invalid TIMEZONE setting in ${src}"	65	echo "You have an invalid TIMEZONE setting in $src"
68	echo "Your ${etc_lt} has been reset to Universal; enjoy!"	66	echo "Your $etc_lt has been reset to Universal; enjoy!"
69	tz="Universal"	67	tz="Universal"
70	echo "Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz}"	68	echo "Updating $etc_lt with $D${datadir}/zoneinfo/$tz"
71	if [ -L ${etc_lt} ] ; then	69	if [ -L "$etc_lt" ]; then
72	rm -f "${etc_lt}"	70	rm -f "$etc_lt"
73	fi	71	fi
74	ln -s "${datadir}/zoneinfo/${tz}" "${etc_lt}"	72	ln -s "${datadir}/zoneinfo/$tz" "$etc_lt"
75	fi	73	fi
76	}	74	}
77		75
78	# Packages primarily organized by directory with a major city	76	# Packages are primarily organized by directory with a major city in most time
79	# in most time zones in the base package	77	# zones in the base package
80
81	TZ_PACKAGES = " \	78	TZ_PACKAGES = " \
82	tzdata-core tzdata-misc tzdata-posix tzdata-right tzdata-africa \	79	tzdata-core tzdata-misc tzdata-posix tzdata-right tzdata-africa \
83	tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \	80	tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
84	tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"	81	tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
		82	"
85	PACKAGES = "${TZ_PACKAGES} ${PN}"	83	PACKAGES = "${TZ_PACKAGES} ${PN}"
86		84
87	FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*"	85	FILES:tzdata-africa += "${datadir}/zoneinfo/Africa"
88	RPROVIDES_tzdata-africa = "tzdata-africa"	86
89		87	FILES:tzdata-americas += " \
90	FILES_tzdata-americas += "${datadir}/zoneinfo/America/* \	88	${datadir}/zoneinfo/America \
91	${datadir}/zoneinfo/US/* \	89	${datadir}/zoneinfo/US \
92	${datadir}/zoneinfo/Brazil/* \	90	${datadir}/zoneinfo/Brazil \
93	${datadir}/zoneinfo/Canada/* \	91	${datadir}/zoneinfo/Canada \
94	${datadir}/zoneinfo/Mexico/* \	92	${datadir}/zoneinfo/Mexico \
95	${datadir}/zoneinfo/Chile/*"	93	${datadir}/zoneinfo/Chile \
96	RPROVIDES_tzdata-americas = "tzdata-americas"	94	"
97		95
98	FILES_tzdata-antarctica += "${datadir}/zoneinfo/Antarctica/*"	96	FILES:tzdata-antarctica += "${datadir}/zoneinfo/Antarctica"
99	RPROVIDES_tzdata-antarctica = "tzdata-antarctica"	97
100		98	FILES:tzdata-arctic += "${datadir}/zoneinfo/Arctic"
101	FILES_tzdata-arctic += "${datadir}/zoneinfo/Arctic/*"	99
102	RPROVIDES_tzdata-arctic = "tzdata-arctic"	100	FILES:tzdata-asia += " \
103		101	${datadir}/zoneinfo/Asia \
104	FILES_tzdata-asia += "${datadir}/zoneinfo/Asia/* \	102	${datadir}/zoneinfo/Indian \
105	${datadir}/zoneinfo/Indian/* \	103	${datadir}/zoneinfo/Mideast \
106	${datadir}/zoneinfo/Mideast/*"	104	"
107	RPROVIDES_tzdata-asia = "tzdata-asia"	105
108		106	FILES:tzdata-atlantic += "${datadir}/zoneinfo/Atlantic"
109	FILES_tzdata-atlantic += "${datadir}/zoneinfo/Atlantic/*"	107
110	RPROVIDES_tzdata-atlantic = "tzdata-atlantic"	108	FILES:tzdata-australia += "${datadir}/zoneinfo/Australia"
111		109
112	FILES_tzdata-australia += "${datadir}/zoneinfo/Australia/*"	110	FILES:tzdata-europe += "${datadir}/zoneinfo/Europe"
113	RPROVIDES_tzdata-australia = "tzdata-australia"	111
114		112	FILES:tzdata-pacific += "${datadir}/zoneinfo/Pacific"
115	FILES_tzdata-europe += "${datadir}/zoneinfo/Europe/*"	113
116	RPROVIDES_tzdata-europe = "tzdata-europe"	114	FILES:tzdata-posix += "${datadir}/zoneinfo/posix"
117		115
118	FILES_tzdata-pacific += "${datadir}/zoneinfo/Pacific/*"	116	FILES:tzdata-right += "${datadir}/zoneinfo/right"
119	RPROVIDES_tzdata-pacific = "tzdata-pacific"	117
120		118	FILES:tzdata-misc += " \
121	FILES_tzdata-posix += "${datadir}/zoneinfo/posix/*"	119	${datadir}/zoneinfo/Cuba \
122	RPROVIDES_tzdata-posix = "tzdata-posix"	120	${datadir}/zoneinfo/Egypt \
123		121	${datadir}/zoneinfo/Eire \
124	FILES_tzdata-right += "${datadir}/zoneinfo/right/*"	122	${datadir}/zoneinfo/Factory \
125	RPROVIDES_tzdata-right = "tzdata-right"	123	${datadir}/zoneinfo/GB-Eire \
126		124	${datadir}/zoneinfo/Hongkong \
127	FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \	125	${datadir}/zoneinfo/Iceland \
128	${datadir}/zoneinfo/Egypt \	126	${datadir}/zoneinfo/Iran \
129	${datadir}/zoneinfo/Eire \	127	${datadir}/zoneinfo/Israel \
130	${datadir}/zoneinfo/Factory \	128	${datadir}/zoneinfo/Jamaica \
131	${datadir}/zoneinfo/GB-Eire \	129	${datadir}/zoneinfo/Japan \
132	${datadir}/zoneinfo/Hongkong \	130	${datadir}/zoneinfo/Kwajalein \
133	${datadir}/zoneinfo/Iceland \	131	${datadir}/zoneinfo/Libya \
134	${datadir}/zoneinfo/Iran \	132	${datadir}/zoneinfo/Navajo \
135	${datadir}/zoneinfo/Israel \	133	${datadir}/zoneinfo/Poland \
136	${datadir}/zoneinfo/Jamaica \	134	${datadir}/zoneinfo/Portugal \
137	${datadir}/zoneinfo/Japan \	135	${datadir}/zoneinfo/Singapore \
138	${datadir}/zoneinfo/Kwajalein \	136	${datadir}/zoneinfo/Turkey \
139	${datadir}/zoneinfo/Libya \	137	"
140	${datadir}/zoneinfo/Navajo \	138
141	${datadir}/zoneinfo/Poland \	139	FILES:tzdata-core += " \
142	${datadir}/zoneinfo/Portugal \	140	${sysconfdir}/localtime \
143	${datadir}/zoneinfo/Singapore \	141	${sysconfdir}/timezone \
144	${datadir}/zoneinfo/Turkey"	142	${datadir}/zoneinfo/leapseconds \
145	RPROVIDES_tzdata-misc = "tzdata-misc"	143	${datadir}/zoneinfo/leap-seconds.list \
146		144	${datadir}/zoneinfo/Pacific/Honolulu \
147	FILES_tzdata-core += " \	145	${datadir}/zoneinfo/America/Anchorage \
148	${sysconfdir}/localtime \	146	${datadir}/zoneinfo/America/Los_Angeles \
149	${sysconfdir}/timezone \	147	${datadir}/zoneinfo/America/Denver \
150	${datadir}/zoneinfo/leapseconds \	148	${datadir}/zoneinfo/America/Chicago \
151	${datadir}/zoneinfo/leap-seconds.list \	149	${datadir}/zoneinfo/America/New_York \
152	${datadir}/zoneinfo/Pacific/Honolulu \	150	${datadir}/zoneinfo/America/Caracas \
153	${datadir}/zoneinfo/America/Anchorage \	151	${datadir}/zoneinfo/America/Sao_Paulo \
154	${datadir}/zoneinfo/America/Los_Angeles \	152	${datadir}/zoneinfo/Europe/London \
155	${datadir}/zoneinfo/America/Denver \	153	${datadir}/zoneinfo/Europe/Paris \
156	${datadir}/zoneinfo/America/Chicago \	154	${datadir}/zoneinfo/Africa/Cairo \
157	${datadir}/zoneinfo/America/New_York \	155	${datadir}/zoneinfo/Europe/Moscow \
158	${datadir}/zoneinfo/America/Caracas \	156	${datadir}/zoneinfo/Asia/Dubai \
159	${datadir}/zoneinfo/America/Sao_Paulo \	157	${datadir}/zoneinfo/Asia/Karachi \
160	${datadir}/zoneinfo/Europe/London \	158	${datadir}/zoneinfo/Asia/Dhaka \
161	${datadir}/zoneinfo/Europe/Paris \	159	${datadir}/zoneinfo/Asia/Bangkok \
162	${datadir}/zoneinfo/Africa/Cairo \	160	${datadir}/zoneinfo/Asia/Hong_Kong \
163	${datadir}/zoneinfo/Europe/Moscow \	161	${datadir}/zoneinfo/Asia/Tokyo \
164	${datadir}/zoneinfo/Asia/Dubai \	162	${datadir}/zoneinfo/Australia/Darwin \
165	${datadir}/zoneinfo/Asia/Karachi \	163	${datadir}/zoneinfo/Australia/Adelaide \
166	${datadir}/zoneinfo/Asia/Dhaka \	164	${datadir}/zoneinfo/Australia/Brisbane \
167	${datadir}/zoneinfo/Asia/Bangkok \	165	${datadir}/zoneinfo/Australia/Sydney \
168	${datadir}/zoneinfo/Asia/Hong_Kong \	166	${datadir}/zoneinfo/Pacific/Noumea \
169	${datadir}/zoneinfo/Asia/Tokyo \	167	${datadir}/zoneinfo/CET \
170	${datadir}/zoneinfo/Australia/Darwin \	168	${datadir}/zoneinfo/CST6CDT \
171	${datadir}/zoneinfo/Australia/Adelaide \	169	${datadir}/zoneinfo/EET \
172	${datadir}/zoneinfo/Australia/Brisbane \	170	${datadir}/zoneinfo/EST \
173	${datadir}/zoneinfo/Australia/Sydney \	171	${datadir}/zoneinfo/EST5EDT \
174	${datadir}/zoneinfo/Pacific/Noumea \	172	${datadir}/zoneinfo/GB \
175	${datadir}/zoneinfo/CET \	173	${datadir}/zoneinfo/GMT \
176	${datadir}/zoneinfo/CST6CDT \	174	${datadir}/zoneinfo/GMT+0 \
177	${datadir}/zoneinfo/EET \	175	${datadir}/zoneinfo/GMT-0 \
178	${datadir}/zoneinfo/EST \	176	${datadir}/zoneinfo/GMT0 \
179	${datadir}/zoneinfo/EST5EDT \	177	${datadir}/zoneinfo/Greenwich \
180	${datadir}/zoneinfo/GB \	178	${datadir}/zoneinfo/HST \
181	${datadir}/zoneinfo/GMT \	179	${datadir}/zoneinfo/MET \
182	${datadir}/zoneinfo/GMT+0 \	180	${datadir}/zoneinfo/MST \
183	${datadir}/zoneinfo/GMT-0 \	181	${datadir}/zoneinfo/MST7MDT \
184	${datadir}/zoneinfo/GMT0 \	182	${datadir}/zoneinfo/NZ \
185	${datadir}/zoneinfo/Greenwich \	183	${datadir}/zoneinfo/NZ-CHAT \
186	${datadir}/zoneinfo/HST \	184	${datadir}/zoneinfo/PRC \
187	${datadir}/zoneinfo/MET \	185	${datadir}/zoneinfo/PST8PDT \
188	${datadir}/zoneinfo/MST \	186	${datadir}/zoneinfo/ROC \
189	${datadir}/zoneinfo/MST7MDT \	187	${datadir}/zoneinfo/ROK \
190	${datadir}/zoneinfo/NZ \	188	${datadir}/zoneinfo/UCT \
191	${datadir}/zoneinfo/NZ-CHAT \	189	${datadir}/zoneinfo/UTC \
192	${datadir}/zoneinfo/PRC \	190	${datadir}/zoneinfo/Universal \
193	${datadir}/zoneinfo/PST8PDT \	191	${datadir}/zoneinfo/W-SU \
194	${datadir}/zoneinfo/ROC \	192	${datadir}/zoneinfo/WET \
195	${datadir}/zoneinfo/ROK \	193	${datadir}/zoneinfo/Zulu \
196	${datadir}/zoneinfo/UCT \	194	${datadir}/zoneinfo/zone.tab \
197	${datadir}/zoneinfo/UTC \	195	${datadir}/zoneinfo/zone1970.tab \
198	${datadir}/zoneinfo/Universal \	196	${datadir}/zoneinfo/iso3166.tab \
199	${datadir}/zoneinfo/W-SU \	197	${datadir}/zoneinfo/Etc \
200	${datadir}/zoneinfo/WET \	198	"
201	${datadir}/zoneinfo/Zulu \	199
202	${datadir}/zoneinfo/zone.tab \	200	CONFFILES:tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone"
203	${datadir}/zoneinfo/zone1970.tab \	201
204	${datadir}/zoneinfo/iso3166.tab \	202	ALLOW_EMPTY:${PN} = "1"
205	${datadir}/zoneinfo/Etc/*"	203
206		204	RDEPENDS:${PN} = "${TZ_PACKAGES}"
207	CONFFILES_tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone"
208
209	ALLOW_EMPTY_${PN} = "1"
210	RDEPENDS_${PN} = "${TZ_PACKAGES}"