From 20271a0011c21ed15704017ec83be6d21b47c1ac Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 18 Nov 2014 19:38:27 +0100 Subject: [PATCH] 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: Martin Dorwig Signed-off-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/tzdata/tzdata.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 47e29c0cc5..d0aa8570b3 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -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