Merge pull request #70 from beckermr/no-hacks

conda-forge · Sep 27, 2024 · 6c46b02 · 6c46b02
2 parents 2b16024 + 359f488
commit 6c46b02
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 50 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/...64cross_target_platformlinux-aarch64.yaml → ...rmlinux-aarch64target_machineaarch64.yaml b/...64cross_target_platformlinux-aarch64.yaml → ...rmlinux-aarch64target_machineaarch64.yaml
@@ -1,5 +1,5 @@
 cdt_name:
-- cos6
+- cos7
 centos_machine:
 - aarch64
 channel_sources:

diff --git a/...lecross_target_platformlinux-ppc64le.yaml → ...nux-ppc64letarget_machinepowerpc64le.yaml b/...lecross_target_platformlinux-ppc64le.yaml → ...nux-ppc64letarget_machinepowerpc64le.yaml
@@ -1,5 +1,5 @@
 cdt_name:
-- cos6
+- cos7
 centos_machine:
 - ppc64le
 channel_sources:

diff --git a/...390xcross_target_platformlinux-s390x.yaml → ...atformlinux-s390xtarget_machines390x.yaml b/...390xcross_target_platformlinux-s390x.yaml → ...atformlinux-s390xtarget_machines390x.yaml
@@ -1,5 +1,5 @@
 cdt_name:
-- cos6
+- cos7
 centos_machine:
 - s390x
 channel_sources:

diff --git a/...ex86_64cross_target_platformlinux-64.yaml → ...platformlinux-64target_machinex86_64.yaml b/...ex86_64cross_target_platformlinux-64.yaml → ...platformlinux-64target_machinex86_64.yaml
@@ -1,5 +1,5 @@
 cdt_name:
-- cos6
+- cos7
 centos_machine:
 - x86_64
 channel_sources:

diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
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 = "2" %}
+{% set build_number = "3" %}
 {% 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" %}
@@ -113,22 +113,12 @@ outputs:
       binary_relocation: False
       detect_binary_files_with_prefix: False
     requirements:
-      run:
-        - _sysroot_{{ cross_target_platform }}_curr_repodata_hack 3.*
       run_constrained:
         - sysroot_{{ cross_target_platform }} =={{ version }}
     test:
       commands:
         test -f $PREFIX/{{ target_machine }}-{{ ctng_vendor }}-linux-gnu/sysroot/usr/include/linux/version.h
 
-  - name: _sysroot_{{ cross_target_platform }}_curr_repodata_hack
-    version: 3
-    build:
-      noarch: generic
-    test:
-      commands:
-        - echo "works!"
-
   - name: sysroot_{{ cross_target_platform }}
     script: build-sysroot.sh
     build:
@@ -143,7 +133,6 @@ outputs:
           - __glibc >={{ version }},<3.0.a0
     requirements:
       run:
-        - _sysroot_{{ cross_target_platform }}_curr_repodata_hack 3.*
         - {{ pin_subpackage('kernel-headers_' ~ cross_target_platform, exact=True) }}
     test:
       commands:
@@ -180,7 +169,7 @@ outputs:
         - find "${PREFIX}" \( -name 'libcrypt*' -o -name 'crypt.*' \) | { ! grep . ; }
 
 about:
-  home: http://sources.redhat.com/glibc/
+  home: https://repo.almalinux.org/vault/8.7
   license: LGPL-2.0-or-later AND LGPL-2.0-or-later WITH exceptions AND GPL-2.0-or-later AND MPL-2.0
   license_family: GPL
   license_file: nss-license