Merge pull request #77 from h-vetinari/tzdata

Use tzdata package
conda-forge · Oct 22, 2024 · 6a06162 · 6a06162
2 parents 6c46b02 + 20b9c01
commit 6a06162
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 16 deletions.
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/build-sysroot.sh b/recipe/build-sysroot.sh
@@ -4,7 +4,6 @@ mkdir -p ${PREFIX}/${target_machine}-${ctng_vendor}-linux-gnu/sysroot
 pushd ${PREFIX}/${target_machine}-${ctng_vendor}-linux-gnu/sysroot > /dev/null 2>&1
 cp -Rf "${SRC_DIR}"/binary/* .
 mkdir -p usr/include
-cp -Rf "${SRC_DIR}"/binary-tzdata/* usr/
 cp -Rf "${SRC_DIR}"/binary-glibc-headers/include/* usr/include/
 cp -Rf "${SRC_DIR}"/binary-glibc-devel/* usr/
 cp -Rf "${SRC_DIR}"/binary-glibc-static/* usr/
@@ -48,6 +47,9 @@ if [[ "$target_machine" == "s390x" ]]; then
    ln -s $PWD/lib64/ld-* $PWD/lib64/ld64.so.1
 fi
 
+mkdir -p usr/share
+ln -sf ${PREFIX}/share/zoneinfo usr/share/zoneinfo
+
 # we don't need these
 rm -rf usr/share/man
 rm -rf usr/lib/systemd

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set version = "2.28" %}
 {% set kernel_headers_version = "4.18.0" %}
-{% set build_number = "3" %}
+{% set build_number = "4" %}
 {% set rpm_url = "https://repo.almalinux.org/vault/8.7/BaseOS/" ~ centos_machine ~ "/os/Packages" %}
 {% set appstream_rpm_url = "https://repo.almalinux.org/vault/8.7/AppStream/" ~ centos_machine ~ "/os/Packages" %}
 {% set powertools_rpm_url = "https://repo.almalinux.org/vault/8.7/PowerTools/" ~ centos_machine ~ "/os/Packages" %}
@@ -59,10 +59,6 @@ source:
     sha256: 890ce026fdab076710e1c0ffc6ee808a4c41b75f336529990ead3fa05b5712f3  # [cross_target_platform == "linux-ppc64le"]
     sha256: c20ecc30eb7f4b2114bc703186608eb4066c0e27487ef98d67214b80c9674fb6  # [cross_target_platform == "linux-s390x"]
 
-  - folder: binary-tzdata
-    url: https://repo.almalinux.org/vault/8.7/BaseOS/x86_64/os/Packages/tzdata-2023c-1.el8.noarch.rpm
-    sha256: b33647f0a02d09d96fadf9c18ad421931061aaf608e0e7a86e702c9b3f4e3111
-
   - folder: binary-glibc-langpacks
     url: {{ rpm_url }}/glibc-all-langpacks-2.28-211.el8.{{ centos_machine }}.rpm
     sha256: c9b9f8b070c8727770848823f88125370e11d3bc97e2d71ee86e46d65b764a5c  # [cross_target_platform == "linux-64"]
@@ -134,6 +130,7 @@ outputs:
     requirements:
       run:
         - {{ pin_subpackage('kernel-headers_' ~ cross_target_platform, exact=True) }}
+        - tzdata
     test:
       commands:
         - test -f $PREFIX/{{ target_machine }}-conda-linux-gnu/sysroot/lib/libc.so.6