summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorHaris Okanovic <haris.okanovic@ni.com>2016-01-05 13:04:29 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-11 23:26:30 +0000
commit3c8a45180f430416a47af434f7fdc7246ad89cf4 (patch)
tree0ed46c0a74104d4582e77831bc8dd9a5d4b4fa4d /meta
parentb80da02ce9b683f96393fe0ea1f5f1a5f1a07c89 (diff)
downloadpoky-3c8a45180f430416a47af434f7fdc7246ad89cf4.tar.gz
tzdata: Make /etc/timezone optional
Add INSTALL_TIMEZONE_FILE config variable to enable/disable installation of ${sysconfdir}/timezone (/etc/timezone) by tzdata packages. Defaults to "1" to maintain previous behavior. Most libc implementations can be configured to retrieve system's defaults timezone from /etc/localtime, and don't need a second file (/etc/timezone) to express this configuration. Maintaining this file is an unnecessary burden on sysadmins unless there's software using /etc/timezone directly (I.e. outside of libc). Some distributions may choose not to provide it. Testing: Built tzdata under default config and verified CONFFILES_tzdata still has both /etc/timezone and /etc/localtime and both are in the image. Built with INSTALL_TIMEZONE_FILE = "0" and verified /etc/timezone is removed from CONFFILES_tzdata and the image. Successfully installed package to an x64 target. (From OE-Core rev: 5c535bf45fc324e31b42364c99d6fffa00167995) Signed-off-by: Haris Okanovic <haris.okanovic@ni.com> Reviewed-by: Brad Mouring <brad.mouring@ni.com> Reviewed-by: Rich Tollerton <rich.tollerton@ni.com> Reviewed-by: Ken Sharp <ken.sharp@ni.com> Reviewed-by: Ross Burton <ross.burton@intel.com> Natinst-ReviewBoard-ID: 121628 Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/tzdata/tzdata_2015g.bb8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-extended/tzdata/tzdata_2015g.bb b/meta/recipes-extended/tzdata/tzdata_2015g.bb
index 5b2afa6a31..a6faa1d19c 100644
--- a/meta/recipes-extended/tzdata/tzdata_2015g.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2015g.bb
@@ -21,6 +21,7 @@ RCONFLICTS_${PN} = "timezones timezone-africa timezone-america timezone-antarcti
21S = "${WORKDIR}" 21S = "${WORKDIR}"
22 22
23DEFAULT_TIMEZONE ?= "Universal" 23DEFAULT_TIMEZONE ?= "Universal"
24INSTALL_TIMEZONE_FILE ?= "1"
24 25
25TZONES= "africa antarctica asia australasia europe northamerica southamerica \ 26TZONES= "africa antarctica asia australasia europe northamerica southamerica \
26 factory etcetera backward systemv \ 27 factory etcetera backward systemv \
@@ -48,7 +49,9 @@ do_install () {
48 # Install default timezone 49 # Install default timezone
49 if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then 50 if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then
50 install -d ${D}${sysconfdir} 51 install -d ${D}${sysconfdir}
51 echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone 52 if [ "${INSTALL_TIMEZONE_FILE}" == "1" ]; then
53 echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone
54 fi
52 ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime 55 ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime
53 else 56 else
54 bberror "DEFAULT_TIMEZONE is set to an invalid value." 57 bberror "DEFAULT_TIMEZONE is set to an invalid value."
@@ -205,4 +208,5 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \
205 ${datadir}/zoneinfo/iso3166.tab \ 208 ${datadir}/zoneinfo/iso3166.tab \
206 ${datadir}/zoneinfo/Etc/*" 209 ${datadir}/zoneinfo/Etc/*"
207 210
208CONFFILES_${PN} += "${sysconfdir}/timezone ${sysconfdir}/localtime" 211CONFFILES_${PN} += "${@ "${sysconfdir}/timezone" if bb.utils.to_boolean(d.getVar('INSTALL_TIMEZONE_FILE', True)) else "" }"
212CONFFILES_${PN} += "${sysconfdir}/localtime"