jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: allow not setting a default, system-wide time zone

Browse Source 
It is valid that there is no system-wide default time zone defined, in
which case Etc/UTC is assumed.

Fixes: #12316

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Martin Bark <martin@barkynet.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Richard Braun <rbraun@sceen.net>
Cc: Andrew Trapani <andrew.trapani@ontera.bio>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Yann E. MORIN 2019-11-16 10:10:04 +01:00 committed by Thomas Petazzoni
parent 13f05cbfc0
commit 0fb87516a4
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/tz/tz.mk
View File

@ -8,6 +8,16 @@ TZ_DEPENDENCIES = host-tzdata host-tzdump
TZ_LICENSE = Public domain TZ_LICENSE = Public domain
TZ_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME)) TZ_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME))
ifneq ($(TZ_LOCALTIME),)
define TZ_SET_LOCALTIME
if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZ_LOCALTIME) ]; then \
printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
"$(TZ_LOCALTIME)"; \
exit 1; \
fi
ln -sf ../usr/share/zoneinfo/uclibc/$(TZ_LOCALTIME) $(TARGET_DIR)/etc/TZ
endef
endif
define TZ_BUILD_CMDS define TZ_BUILD_CMDS
(cd $(HOST_DIR)/share/zoneinfo/posix/; \ (cd $(HOST_DIR)/share/zoneinfo/posix/; \
@ -25,12 +35,7 @@ define TZ_INSTALL_TARGET_CMDS
$(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZ_LOCALTIME) ]; then \ $(TZ_SET_LOCALTIME)
printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
"$(TZ_LOCALTIME)"; \
exit 1; \
fi
ln -sf ../usr/share/zoneinfo/uclibc/$(TZ_LOCALTIME) $(TARGET_DIR)/etc/TZ
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

19
package/tzdata/tzdata.mk
View File

@ -26,6 +26,17 @@ TZDATA_ZONELIST = $(call qstrip,$(BR2_TARGET_TZ_ZONELIST))
endif endif
TZDATA_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME)) TZDATA_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME))
ifneq ($(TZDATA_LOCALTIME),)
define TZDATA_SET_LOCALTIME
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
ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) $(TARGET_DIR)/etc/localtime
echo "$(TZDATA_LOCALTIME)" >$(TARGET_DIR)/etc/timezone
endef
endif
# No need to extract for target, we're using the host-installed files # No need to extract for target, we're using the host-installed files
TZDATA_EXTRACT_CMDS = TZDATA_EXTRACT_CMDS =
@ -37,13 +48,7 @@ define TZDATA_INSTALL_TARGET_CMDS
for zone in posix/*; do \ for zone in posix/*; do \
ln -sfn "$${zone}" "$${zone##*/}"; \ ln -sfn "$${zone}" "$${zone##*/}"; \
done done
if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \ $(TZDATA_SET_LOCALTIME)
printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
"$(TZDATA_LOCALTIME)"; \
exit 1; \
fi
ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) $(TARGET_DIR)/etc/localtime
echo "$(TZDATA_LOCALTIME)" >$(TARGET_DIR)/etc/timezone
endef endef
define HOST_TZDATA_BUILD_CMDS define HOST_TZDATA_BUILD_CMDS

2
system/Config.in
View File

@ -494,6 +494,8 @@ config BR2_TARGET_LOCALTIME
Pacific/Wallis Pacific/Wallis
... ...
Set to empty to not install a default time zone.
endif # BR2_TARGET_TZ_INFO endif # BR2_TARGET_TZ_INFO
config BR2_ROOTFS_USERS_TABLES config BR2_ROOTFS_USERS_TABLES