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

package/tzdata: fix installation commands 



If the destination directory already exists (e.g. because of a re-run or
a custom skeleton), then the zoneinfo files will be installed in a
sub-directory of where we are trying to install them.

Fix that by creating the destination directory and copying the content
of the source directory.

Also fix the host install commands to match what we do in the target
install commands.

Reported-by: default avatarMartin Dorwig <dorwig@tetronik.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 2c715179

package/tzdata/tzdata.mk

+3 −3
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ TZDATA_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME)) 
TZDATA_EXTRACT_CMDS =



define TZDATA_INSTALL_TARGET_CMDS

	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share

	cp -a $(HOST_DIR)/usr/share/zoneinfo $(TARGET_DIR)/usr/share/zoneinfo

	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/zoneinfo

	cp -a $(HOST_DIR)/usr/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo

	cd $(TARGET_DIR)/usr/share/zoneinfo;    \

	for zone in posix/*; do                 \

	    ln -sfn "$${zone}" "$${zone##*/}";  \
@@ -59,7 +59,7 @@ define HOST_TZDATA_BUILD_CMDS 
endef



define HOST_TZDATA_INSTALL_CMDS

	mkdir -p $(HOST_DIR)/usr/share/zoneinfo

	$(INSTALL) -d -m 0755 $(HOST_DIR)/usr/share/zoneinfo

	cp -a $(@D)/_output/* $(@D)/*.tab $(HOST_DIR)/usr/share/zoneinfo

endef