Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automate hash calculation; update sources to alma 8.9 #79

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

h-vetinari
Copy link
Member

@h-vetinari h-vetinari commented Oct 22, 2024

Makes it easier to update to newer alma versions (including minor ones). For major bumps, this will even modify the subfolders of the RPMs accordingly.

Builds on #77 & #78, so review those first.

@conda-forge-admin
Copy link
Contributor

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.
I do have some suggestions for making it better though...

For recipe/meta.yaml:

  • License exception is not an SPDX exception.

Documentation on acceptable licenses can be found here.

@h-vetinari
Copy link
Member Author

With the automation here, the alma 9 update in #80 only requires the following changes (aside from unavoidable adaptations to infrastructure changes in alma itself):

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
index 0c256de..97f1b44 100644
--- a/recipe/conda_build_config.yaml
+++ b/recipe/conda_build_config.yaml
@@ -15,22 +15,22 @@ cross_target_platform:
   - linux-s390x

 alma_version:
-  - "8.9"
+  - "9.3"
 glibc_version:
-  - "2.28"
+  - "2.34"
 kh_version:
-  - "4.18.0"
+  - "5.14.0"
 # glibc artefacts have two build numbers plus the alma version, e.g.
 #   2.28-236.el8_9.13.x86_64.rpm
 #   ↑    ↑     ↑   ↑
 #   └glibc_ver └alma_version
 #        └build1   └build2
 glibc_build1:
-  - "236"
+  - "83"
 glibc_build2:
-  - "13"
+  - "12"
 kh_build:
-  - "513.24.1"
+  - "362.24.2"
 # nss-* versions need to be set in meta.yaml (and/or update.py)

 ctng_vendor:
diff --git a/recipe/update.py b/recipe/update.py
index 8f816de..edbc25b 100644
--- a/recipe/update.py
+++ b/recipe/update.py
@@ -54,7 +54,7 @@ name2string = {
     "nss_db": glibc_string,
     # manual override
     "nss_nis": "3.0-8.el8",
-    "nss-softokn-freebl": "3.90.0-6.el8_9",
+    "nss-softokn-freebl": "3.90.0-7.el9_3",
 }

 def get_subfolder(pkg, string):

recipe/meta.yaml Outdated
@@ -102,15 +112,15 @@ build:

outputs:
- name: kernel-headers_{{ cross_target_platform }}
version: {{ kernel_headers_version }}
version: {{ kh_version }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep the name here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It just gets very long if we use that prefix consistently... 🤷

@h-vetinari
Copy link
Member Author

FWIW, the changes here are much easier to review commit by commit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants