gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "package/tzdata: install a default localtime"

Browse Source 
This reverts commit f96e4d7f34.

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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "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: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2014-01-28 22:33:54 +01:00 committed by Peter Korsgaard
parent d8fd2b3ed6
commit 167ca173f6
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/tzdata/Config.in
View File

@ -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

8
package/tzdata/tzdata.mk
View File

@ -39,14 +39,8 @@ define TZDATA_INSTALL_TARGET_CMDS
cp -a $(@D)/_output/* $(TARGET_DIR)/usr/share/zoneinfo
cd $(TARGET_DIR)/usr/share/zoneinfo; \
for zone in posix/*; do \
ln -sfn "$${zone}" "$${zone##*/}"; \
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))