summaryrefslogtreecommitdiff
path: root/package/tzdata
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbrodkorb@conet.de>2015-02-10 09:55:46 +0100
committerWaldemar Brodkorb <wbrodkorb@conet.de>2015-02-10 09:55:46 +0100
commit7ebb4d69857eaa70ea3d4a55ffeb85502805dc96 (patch)
treee56cbb99aa76cfcdb1dd282d865c0c4136df48c2 /package/tzdata
parentfbddcd227c26995d2933517b9dbb2d7dd3d5c9b6 (diff)
Revert "split tzdata and tzcode, using multiple DISTFILES no longer supported"
This reverts commit 04c36baff7046c5efbef07d2d5df778950c3e40c.
Diffstat (limited to 'package/tzdata')
-rw-r--r--package/tzdata/Makefile29
1 files changed, 20 insertions, 9 deletions
diff --git a/package/tzdata/Makefile b/package/tzdata/Makefile
index 45c2b5fc7..bf1b6d136 100644
--- a/package/tzdata/Makefile
+++ b/package/tzdata/Makefile
@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= tzdata
PKG_VERSION:= 2014d
PKG_RELEASE:= 1
-PKG_HASH:= 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0
+PKG_HASH:= 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0 e9c775bb76c9700521ada77776277c25f8650a22b56d46c9f00f4147970ef13e
PKG_DESCR:= timezone data (/usr/share/zoneinfo)
PKG_SECTION:= base/apps
PKG_URL:= http://www.iana.org/time-zones/
@@ -15,29 +15,36 @@ PKG_NOPARALLEL:= 1
PKG_LIBC_DEPENDS:= glibc musl
-DISTFILES:= $(PKG_NAME)$(PKG_VERSION).tar.gz
-WRKDIST= $(WRKDIR)
+DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz tzcode${PKG_VERSION}.tar.gz
+# both archives do not extract into subdirectories
+WRKDIST= ${WRKDIR}
+
+# no use for tzselect, since that is a ksh-script
+PKG_SUBPKGS:= TZDATA DATE
+PKGSD_DATE:= famous date utility
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,TZDATA,tzdata,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,TZDATA,tzdata,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DATE,date,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DATE},${PKG_SECTION}))
CONFIG_STYLE:= manual
HOST_CFLAGS+= -DSTD_INSPIRED=1 -DHAVE_STDINT_H=1
TARGET_CFLAGS+= -DHAVE_INTTYPES_H=1
-XAKE_FLAGS+= TZDIR="/usr/share/zoneinfo" cc="$(TARGET_CC)"
+XAKE_FLAGS+= TZDIR="/usr/share/zoneinfo" cc="${TARGET_CC}"
+# the uppercase targets enable building and installation of the date utility
ALL_TARGET:= ALL
INSTALL_TARGET:= INSTALL
tzdata-install:
$(INSTALL_DIR) $(IDIR_TZDATA)/usr/share/zoneinfo $(IDIR_TZDATA)/etc
- cd $(WRKINST) && for f in UTC $(ADK_RUNTIME_TIMEZONE); do \
+ cd ${WRKINST} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
test -s usr/share/zoneinfo/"$$f" || continue; \
echo usr/share/zoneinfo/"$$f" | \
- $(STAGING_HOST_DIR)/usr/bin/cpio -pdu $(IDIR_TZDATA)/; \
+ ${STAGING_HOST_DIR}/usr/bin/cpio -pdu ${IDIR_TZDATA}/; \
done
tz=; cd $(IDIR_TZDATA)/usr/share/zoneinfo || exit 1; \
- for f in UTC $(ADK_RUNTIME_TIMEZONE); do \
+ for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
test -s "$$f" || continue; \
tz=$$f; \
done; if test x"$$tz" = x""; then \
@@ -48,4 +55,8 @@ tzdata-install:
$(IDIR_TZDATA)/etc/localtime; \
fi
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk
+date-install:
+ ${INSTALL_DIR} ${IDIR_DATE}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/date ${IDIR_DATE}/usr/bin/
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk