From 6150e554104a408a40d3894bad55b4a98a88a853 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 13 Mar 2023 12:06:30 +0100 Subject: timezone: use 'tz' subdir instead of ${WORKDIR} directly (From OE-Core rev: bc53ccaf82c57826acac5f9c2557e403ec367807) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-extended/timezone/timezone.inc | 6 ++++-- meta/recipes-extended/timezone/tzcode-native.bb | 3 --- meta/recipes-extended/timezone/tzdata.bb | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'meta') diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 1834665a1e..eec7177228 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -8,10 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" PV = "2022g" -SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ - http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ +SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \ + http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \ " +S = "${WORKDIR}/tz" + UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" SRC_URI[tzcode.sha256sum] = "9610bb0b9656ff404c361a41f3286da53064b5469d84f00c9cb2314c8614da74" diff --git a/meta/recipes-extended/timezone/tzcode-native.bb b/meta/recipes-extended/timezone/tzcode-native.bb index e3582ba674..d0b23a9d80 100644 --- a/meta/recipes-extended/timezone/tzcode-native.bb +++ b/meta/recipes-extended/timezone/tzcode-native.bb @@ -1,10 +1,7 @@ require timezone.inc -# SUMMARY = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -S = "${WORKDIR}" - inherit native EXTRA_OEMAKE += "cc='${CC}'" diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb index 7f4322d867..ce725008c0 100644 --- a/meta/recipes-extended/timezone/tzdata.bb +++ b/meta/recipes-extended/timezone/tzdata.bb @@ -4,8 +4,6 @@ DEPENDS = "tzcode-native" inherit allarch -S = "${WORKDIR}" - DEFAULT_TIMEZONE ?= "Universal" INSTALL_TIMEZONE_FILE ?= "1" -- cgit v1.2.3-54-g00ecf