Commit d6a37917 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

system: make the zoneinfo list a system option 



[Peter: move legacy options under 2014.05]
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent a518381e

Config.in.legacy

+15 −0
Original line number Diff line number Diff line
@@ -101,6 +101,21 @@ endif 
###############################################################################

comment "Legacy options removed in 2014.05"



config BR2_TARGET_TZ_ZONELIST

	default BR2_PACKAGE_TZDATA_ZONELIST if BR2_PACKAGE_TZDATA_ZONELIST != ""



config BR2_PACKAGE_TZDATA_ZONELIST

	string "tzdata: the timezone list option has been renamed"

	help

	  The option BR2_PACKAGE_TZDATA_ZONELIST has been renamed to

	  BR2_TARGET_TZ_ZONELIST, and moved to the "System configuration"

	  menu. You'll need to select BR2_TARGET_TZ_INFO.



config BR2_PACKAGE_TZDATA_ZONELIST_WRAP

	bool

	default y if BR2_PACKAGE_TZDATA_ZONELIST != ""

	select BR2_LEGACY



config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE

	bool "Lua command-line editing none has been renamed"

	select BR2_LEGACY

package/tzdata/Config.in

+3 −20
Original line number Diff line number Diff line 
comment "tzdata needs an (e)glibc toolchain"

	depends on !BR2_TOOLCHAIN_USES_GLIBC

# This package is not meant to be user-visible.

# It gets selected by BR2_TARGET_TZ in system/Config.in



config BR2_PACKAGE_TZDATA

	bool "tzdata"

	depends on BR2_TOOLCHAIN_USES_GLIBC

	bool

	help

	  Time zone database



	  http://www.iana.org/time-zones/repository/tz-link.html
 


if BR2_PACKAGE_TZDATA



config BR2_PACKAGE_TZDATA_ZONELIST

	string "Time zone list"

	default "default"

	help

	  Space-separated list of time zones to compile.



	  The value "default" includes all commonly used time zones. Note

	  that this set consumes around 5.5M.



	  The full list is the list of files in the time zone database source,

	  not including the build and .tab files.



endif

package/tzdata/tzdata.mk

+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ TZDATA_LICENSE = Public domain 
TZDATA_DEFAULT_ZONELIST = africa antarctica asia australasia backward etcetera \

			europe factory northamerica pacificnew southamerica



ifeq ($(call qstrip,$(BR2_PACKAGE_TZDATA_ZONELIST)),default)

ifeq ($(call qstrip,$(BR2_TARGET_TZ_ZONELIST)),default)

TZDATA_ZONELIST = $(TZDATA_DEFAULT_ZONELIST)

else

TZDATA_ZONELIST = $(call qstrip,$(BR2_PACKAGE_TZDATA_ZONELIST))

TZDATA_ZONELIST = $(call qstrip,$(BR2_TARGET_TZ_ZONELIST))

endif



# Don't strip any path components during extraction.

system/Config.in

+23 −0
Original line number Diff line number Diff line
@@ -267,6 +267,29 @@ config BR2_TARGET_GENERIC_GETTY_OPTIONS 
endmenu

endif



config BR2_TARGET_TZ_INFO

	bool "Install timezone info"

	depends on BR2_TOOLCHAIN_USES_GLIBC

	select BR2_PACKAGE_TZDATA

	help

	  Say 'y' here to install timezone info.



if BR2_TARGET_TZ_INFO



config BR2_TARGET_TZ_ZONELIST

	string "timezone list"

	default "default"

	help

	  Space-separated list of time zones to compile.



	  The value "default" includes all commonly used time zones. Note

	  that this set consumes around 5.5M.



	  The full list is the list of files in the time zone database source,

	  not including the build and .tab files.



endif # BR2_TARGET_TZ_INFO



config BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW

	bool "remount root filesystem read-write during boot"

	default y