summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-11-05 23:08:36 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-18 14:42:12 +0000
commit2bfa6ffb66f59d0ff2c807009da81936d8a55b6c (patch)
tree22c964dc9980eb0d10e6f9772141ae738018d2f1
parent0d773abbb574361d71431890715e925afef167e5 (diff)
downloadpoky-2bfa6ffb66f59d0ff2c807009da81936d8a55b6c.tar.gz
tzdata: Correct the packaging of /etc/localtime and /etc/timezone
During restructuring of the packaging in 2af4d6eb (tzdata: Install everything by default), these two files remained in the tzdata package, which is supposed to be empty. Move them to tzdata-core where they belong. Also simplify the definition of CONFFILES_tzdata-core. As its value only takes effect for files that actually exist, there is no need to complicate its definition by checking if a file is created before adding it to the list of configuration files. (From OE-Core rev: 50e64732585e0d3abe0a8e589d2122a7dc06c826) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/timezone/tzdata.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb
index 82fe369baa..1e2d9bd1b9 100644
--- a/meta/recipes-extended/timezone/tzdata.bb
+++ b/meta/recipes-extended/timezone/tzdata.bb
@@ -147,6 +147,8 @@ FILES_tzdata-misc += "${datadir}/zoneinfo/Cuba \
147RPROVIDES_tzdata-misc = "tzdata-misc" 147RPROVIDES_tzdata-misc = "tzdata-misc"
148 148
149FILES_tzdata-core += " \ 149FILES_tzdata-core += " \
150 ${sysconfdir}/localtime \
151 ${sysconfdir}/timezone \
150 ${datadir}/zoneinfo/Pacific/Honolulu \ 152 ${datadir}/zoneinfo/Pacific/Honolulu \
151 ${datadir}/zoneinfo/America/Anchorage \ 153 ${datadir}/zoneinfo/America/Anchorage \
152 ${datadir}/zoneinfo/America/Los_Angeles \ 154 ${datadir}/zoneinfo/America/Los_Angeles \
@@ -202,8 +204,7 @@ FILES_tzdata-core += " \
202 ${datadir}/zoneinfo/iso3166.tab \ 204 ${datadir}/zoneinfo/iso3166.tab \
203 ${datadir}/zoneinfo/Etc/*" 205 ${datadir}/zoneinfo/Etc/*"
204 206
205CONFFILES_tzdata-core += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE')) else "" }" 207CONFFILES_tzdata-core = "${sysconfdir}/localtime ${sysconfdir}/timezone"
206CONFFILES_tzdata-core += "${sysconfdir}/localtime"
207 208
208ALLOW_EMPTY_${PN} = "1" 209ALLOW_EMPTY_${PN} = "1"
209RDEPENDS_${PN} = "${TZ_PACKAGES}" 210RDEPENDS_${PN} = "${TZ_PACKAGES}"