diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2023-03-13 12:06:30 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-03-23 06:42:22 -1000 |
| commit | 8e047570ca28be2f3761d0944eaa17b64142262b (patch) | |
| tree | aa66fe74cadc4af1f5027c22ae1d95c3615c09fb | |
| parent | 213ed03f5a15be639a97dca6f5bbf810f7ac2eb5 (diff) | |
| download | openembedded-core-contrib-8e047570ca28be2f3761d0944eaa17b64142262b.tar.gz | |
timezone: use 'tz' subdir instead of ${WORKDIR} directly
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bc53ccaf82c57826acac5f9c2557e403ec367807)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-extended/timezone/timezone.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-extended/timezone/tzcode-native.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/timezone/tzdata.bb | 2 |
3 files changed, 4 insertions, 7 deletions
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" |