From de3cda372e37dba4c1a22900c40cd271e7c67d9a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 27 Feb 2021 23:50:35 +0100 Subject: [PATCH] - tzdata: move files to package dir --- make/target-tools.mk | 4 ++-- .../general/tzdata => package/tzdata/files}/timezone.xml | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename {skel-root/general/tzdata => package/tzdata/files}/timezone.xml (100%) diff --git a/make/target-tools.mk b/make/target-tools.mk index b6e59543..c0db2ec1 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -796,14 +796,14 @@ tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR) tar -xf $(DL_DIR)/$(PKG_SOURCE); \ unset ${!LC_*}; LANG=POSIX; LC_ALL=POSIX; export LANG LC_ALL; \ $(HOST_ZIC) -b fat -d zoneinfo.tmp $(TZDATA_ZONELIST); \ - sed -n '/zone=/{s/.*zone="\(.*\)".*$$/\1/; p}' $(TARGET_FILES)/tzdata/timezone.xml | sort -u | \ + sed -n '/zone=/{s/.*zone="\(.*\)".*$$/\1/; p}' $(PKG_FILES_DIR)/timezone.xml | sort -u | \ while read x; do \ find zoneinfo.tmp -type f -name $$x | sort | \ while read y; do \ test -e $$y && $(INSTALL_DATA) -D $$y $(TARGET_datadir)/zoneinfo/$$x; \ done; \ done; \ - $(INSTALL_DATA) -D $(TARGET_FILES)/tzdata/timezone.xml $(TARGET_sysconfdir)/timezone.xml + $(INSTALL_DATA) -D $(PKG_FILES_DIR)/timezone.xml $(TARGET_sysconfdir)/timezone.xml ln -sf $(datadir)/zoneinfo/$(TZDATA_LOCALTIME) $(TARGET_DIR)$(ETC_LOCALTIME) echo "$(TZDATA_LOCALTIME)" > $(TARGET_sysconfdir)/timezone $(REMOVE)/$(PKG_DIR) diff --git a/skel-root/general/tzdata/timezone.xml b/package/tzdata/files/timezone.xml similarity index 100% rename from skel-root/general/tzdata/timezone.xml rename to package/tzdata/files/timezone.xml