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

Revert "package/tzdata: install a default localtime" 



This reverts commit f96e4d7f.

As suggested by Thomas, we need to find a single solution that is
valid for both (e)glibc and uClibc.

There is work on-going by Alexandre, so just revert this for now.

Reported-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent d8fd2b3e

package/tzdata/Config.in

+0 −10
Original line number Diff line number Diff line
@@ -23,14 +23,4 @@ config BR2_PACKAGE_TZDATA_ZONELIST 
	  The full list is the list of files in the time zone database source,

	  not including the build and .tab files.



config BR2_PACKAGE_TZDATA_LOCALTIME

	string "default local time"

	help

	  The time zone to install as the default local time, expressed as a

	  tzdata location, such as:

	    GMT, Europe/Paris, America/New_York, Pacific/Wallis...



	  If empty, no local time will be set, and the dates will be

	  expressed in UTC.



endif

package/tzdata/tzdata.mk

+1 −7
Original line number Diff line number Diff line
@@ -41,12 +41,6 @@ define TZDATA_INSTALL_TARGET_CMDS 
	for zone in posix/*; do                 \

	    ln -sfn "$${zone}" "$${zone##*/}";    \

	done

	if [ -n "$(BR2_PACKAGE_TZDATA_LOCALTIME)" ]; then                   \

	    cd $(TARGET_DIR)/etc;                                           \

	    ln -sf ../usr/share/zoneinfo/$(BR2_PACKAGE_TZDATA_LOCALTIME)    \

	           localtime;                                               \

	    echo "$(BR2_PACKAGE_TZDATA_LOCALTIME)" >timezone;               \

	fi

endef



$(eval $(generic-package))