This project is archived. Its data is read-only.

Commit 5f017a89 authored May 22, 2014 by Yann E. MORIN Committed by Peter Korsgaard May 22, 2014

system/timezone: check localtime exists



When installing a localtime, check it is a valid timezone.

[Peter: extend error message to make it clear to the user what to change]
Reported-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

parent 5d231598

package/tz/tz.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,11 @@ define TZ_INSTALL_TARGET_CMDS
		mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
		cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
		if [ -n "$(TZ_LOCALTIME)" ]; then \
		if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
		printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
		"$(TZDATA_LOCALTIME)"; \
		exit 1; \
		fi; \
		cd $(TARGET_DIR)/etc; \
		ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
		fi

package/tzdata/tzdata.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,11 @@ define TZDATA_INSTALL_TARGET_CMDS
		ln -sfn "$${zone}" "$${zone##*/}"; \
		done
		if [ -n "$(TZDATA_LOCALTIME)" ]; then \
		if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \
		printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
		"$(TZDATA_LOCALTIME)"; \
		exit 1; \
		fi; \
		cd $(TARGET_DIR)/etc; \
		ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \
		echo "$(TZDATA_LOCALTIME)" >timezone; \