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.

Sign up for GitHub

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

Glibc 2.34 from alma 9 #80

Merged
merged 14 commits into from
Oct 27, 2024
Merged

Glibc 2.34 from alma 9 #80

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
743a21e
update to glibc 2.34 / alma 9.3
h-vetinari Oct 22, 2024
6d8749d
drop nss_nis
h-vetinari Oct 22, 2024
66688be
update subfolders for alma 9
h-vetinari Oct 22, 2024
5a630cd
handle different subfolders for determining glibc & kernel-headers ve…
h-vetinari Oct 23, 2024
902e48f
update hashes & urls for alma 9.3
h-vetinari Oct 23, 2024
7cdaf98
handle absence of glibc-headers on aarch/ppc
h-vetinari Oct 23, 2024
3d8a7ae
make hierarchy of if-branches for rewriting of `meta.yaml` easier to …
h-vetinari Oct 24, 2024
f7f701f
fix: add one more feature
beckermr Oct 24, 2024
98958d3
add nss_hesiod
h-vetinari Oct 24, 2024
87e5c71
install libhesiod in expected location
h-vetinari Oct 24, 2024
27bdd93
add tzdata in host to avoid "symlink with no target" warning
h-vetinari Oct 24, 2024
6c49e75
Revert "BUG add libfreebl3.so"
h-vetinari Oct 25, 2024
7bae0d0
remove nss-packages
h-vetinari Oct 25, 2024
400a4d2
add our default infra-feedstock license
h-vetinari Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions recipe/build-sysroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ 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-glibc/* .
mkdir -p usr/include
cp -Rf "${SRC_DIR}"/binary-glibc-headers/include/* usr/include/
cp -Rf "${SRC_DIR}"/binary-glibc-headers/include/* usr/include/ | true
cp -Rf "${SRC_DIR}"/binary-glibc-devel/* usr/
cp -Rf "${SRC_DIR}"/binary-glibc-static/* usr/
cp -Rf "${SRC_DIR}"/binary-glibc-common/* usr/
cp -Rf "${SRC_DIR}"/binary-glibc-nss-devel/* usr/
cp -Rf "${SRC_DIR}"/binary-nss_db/* .
cp -Rf "${SRC_DIR}"/binary-nss_nis/* usr/
cp -Rf "${SRC_DIR}"/binary-glibc-gconv-extra/* usr/
cp -Rf "${SRC_DIR}"/binary-glibc-all-langpacks/* usr/

Expand Down
132 changes: 61 additions & 71 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{% set build_number = "6" %}

{% set alma_version = "8.9" %}
{% set glibc_version = "2.28" %}
{% set kernel_headers_version = "4.18.0" %}
{% set alma_version = "9.3" %}
{% set glibc_version = "2.34" %}
{% set kernel_headers_version = "5.14.0" %}
{% set build_number = "0" %}

{% set rpm_url = "https://repo.almalinux.org/vault/" ~ alma_version ~ "/BaseOS/" ~ centos_machine ~ "/os/Packages" %}
{% set appstream_rpm_url = "https://repo.almalinux.org/vault/" ~ alma_version ~ "/AppStream/" ~ centos_machine ~ "/os/Packages" %}
{% set powertools_rpm_url = "https://repo.almalinux.org/vault/" ~ alma_version ~ "/PowerTools/" ~ centos_machine ~ "/os/Packages" %}
{% set crb_rpm_url = "https://repo.almalinux.org/vault/" ~ alma_version ~ "/CRB/" ~ centos_machine ~ "/os/Packages" %}

package:
name: linux-sysroot
Expand All @@ -17,89 +16,79 @@ source:
# in the recipe folder (after ensuring the versions in CBC are correct)
# START source
- folder: binary-glibc
url: {{ rpm_url }}/glibc-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: 372270ca0753bd9cf00db5aa854b7e0a6c513edf9cb9d1bceea8cec4796e0bbe # [cross_target_platform == "linux-64"]
sha256: c70b1a74854850d99e677b23c3bc97c6fa9fb309a3cb36049aff0a48ca755d5a # [cross_target_platform == "linux-aarch64"]
sha256: 21315346520e2c8a5d301c9a54e05d9f29e1cfb32f8dc49efce4a0fce2b3482a # [cross_target_platform == "linux-ppc64le"]
sha256: b08408bdfc2b4cb4d210bb235414443da66cecb8810dc42e340815f24ee0e481 # [cross_target_platform == "linux-s390x"]
url: {{ rpm_url }}/glibc-2.34-83.el9_3.12.{{ centos_machine }}.rpm
sha256: 0366348e475c71e1b2373407e06a566022f60ab4591bf45d6f7092f5adef014f # [cross_target_platform == "linux-64"]
sha256: c2c0635651ade65520711d7afb6e5e5c9049474f0ab80e524f1dae1446d80479 # [cross_target_platform == "linux-aarch64"]
sha256: cbc76f6710602af069cee78d8c471cf162df1deb36dd417583a73bcf8ef30d3b # [cross_target_platform == "linux-ppc64le"]
sha256: 60465c152332473ecab0e6d219d3ac51457aa5e73110c595179f6f8909637986 # [cross_target_platform == "linux-s390x"]

- folder: binary-glibc-all-langpacks
url: {{ rpm_url }}/glibc-all-langpacks-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: 531b421cec19b5e4a2c0589bc45cacec057d6c7d8a8f9f6e4d8023669afbda53 # [cross_target_platform == "linux-64"]
sha256: 53782952fb4c4dbef7cea98c89a02fb4d5a21bc2070141eeeb4c5497df32fd5d # [cross_target_platform == "linux-aarch64"]
sha256: 004990da77a6ab2f11dacb87580c33876c3c1f021232ea95e669a1b62308838b # [cross_target_platform == "linux-ppc64le"]
sha256: 06635fdd898da811cc311dd2b86eb6c4c9fb232b91ac447dc085ccd1a00c8284 # [cross_target_platform == "linux-s390x"]
url: {{ rpm_url }}/glibc-all-langpacks-2.34-83.el9_3.12.{{ centos_machine }}.rpm
sha256: 496fd0506541ddd1cb762dc67c554bff2ded2184182dbf8601f783b6478f61a8 # [cross_target_platform == "linux-64"]
sha256: cfa7665c35c4b96ff24c8af80719ce279efdd2a91e05e9668407af2888e79180 # [cross_target_platform == "linux-aarch64"]
sha256: afe4080b65a65d730210a660db51e220e1c8e457a3fe5bcd59edb8acc610d273 # [cross_target_platform == "linux-ppc64le"]
sha256: ba10a697cfe98a4dbae3fd93c8d92edaeab68c72b7e7a6e820b4701c2a1cf677 # [cross_target_platform == "linux-s390x"]

- folder: binary-glibc-common
url: {{ rpm_url }}/glibc-common-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: 62e674f5310262440065d1189d52948dfc327b706c8cafb007526ff3df05df8a # [cross_target_platform == "linux-64"]
sha256: f7ec3ffcfaf9d781e2bc0d472ebae88fb5f888885e1b89734fea345f64de700a # [cross_target_platform == "linux-aarch64"]
sha256: d615fb36e7a735b05bf01912f473af086d183c78da258003da02b4a880818750 # [cross_target_platform == "linux-ppc64le"]
sha256: 9576e18b45663d37508d6d048fc8d8740eaf2a4bb2371cffde5174917858b6ec # [cross_target_platform == "linux-s390x"]
url: {{ rpm_url }}/glibc-common-2.34-83.el9_3.12.{{ centos_machine }}.rpm
sha256: 596759343ca2d5175290cf8532ff39438d3ce9826d56fce83bac0258f6f262c1 # [cross_target_platform == "linux-64"]
sha256: 6e902cb456246e90e37847f40739a9afc87d0a44c5dfbb4b9886b1466488356f # [cross_target_platform == "linux-aarch64"]
sha256: e32663c22d13f1d8c33d3de637e420ca0cae4f4bd5c373aaea9d776ea3b7e829 # [cross_target_platform == "linux-ppc64le"]
sha256: 0dab2243c0b7b48c0e2ea965d2a0d139da6f97e9df7266be0fea24180336a325 # [cross_target_platform == "linux-s390x"]

- folder: binary-glibc-devel
url: {{ rpm_url }}/glibc-devel-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: ba78eb42c3a83dec5efb4d70e23532c526a0820ccff8dee31ee783cfcd995185 # [cross_target_platform == "linux-64"]
sha256: 1e675c2a6388c9bb0ddfd63c0a9c163a204abdb8c9f60fc308231fb35efd3e54 # [cross_target_platform == "linux-aarch64"]
sha256: 64d80d525d91757152005c0861b21ed588b9ca319553c24b54e4fd923213f18e # [cross_target_platform == "linux-ppc64le"]
sha256: 8147ebbd6f15bea71b445bbac8d1548f520f8e24ebd1fda096e6759e3ac3ed7d # [cross_target_platform == "linux-s390x"]
url: {{ appstream_rpm_url }}/glibc-devel-2.34-83.el9_3.12.{{ centos_machine }}.rpm
sha256: f5b16c402fe3acde80ca9d27a7401df7d0233958c9dd572c7a291248d01748e1 # [cross_target_platform == "linux-64"]
sha256: 1415393a017b0126eba9caf1dbb3d989618a0ca0fb2fac5fb21846191238eae6 # [cross_target_platform == "linux-aarch64"]
sha256: 02561d1d53bac231bbbcc12763e8e9f67a27e12dc266e82e468662c7f7f6df54 # [cross_target_platform == "linux-ppc64le"]
sha256: 1ec13f4aab24ad12dedf7cd8c77f930a841aaf8ae1c08da16b895f37f7bb577c # [cross_target_platform == "linux-s390x"]

- folder: binary-glibc-gconv-extra
url: {{ rpm_url }}/glibc-gconv-extra-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: d7a88ab0c32573c0e67a7615a8d5684a78459ab8958ef9eccc11e7e0ceb27165 # [cross_target_platform == "linux-64"]
sha256: ec99fbd1cac3bc54a363628b25d5c440b9a65d592381c9a63ac11da0fe1a0602 # [cross_target_platform == "linux-aarch64"]
sha256: 5b5ec48c05da06778ff0a97f229472c43f995b0f4858a29313b09f7859fe4c06 # [cross_target_platform == "linux-ppc64le"]
sha256: bdede6fee32acf52adf5cc669d6d5b68d6921cc101a23536147c8f0312aee0f1 # [cross_target_platform == "linux-s390x"]

- folder: binary-glibc-headers
url: {{ rpm_url }}/glibc-headers-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: 06ca75b82882634be4d21163799b31a74a63328f46e462930cbd0c5f51840680 # [cross_target_platform == "linux-64"]
sha256: db5b2ba4d7ff82293f27b644e1e2e470870fe6d0e3ff5019a2c01a0f10617322 # [cross_target_platform == "linux-aarch64"]
sha256: 9af0dfb99b3e1b48cd12478cf5990d81ca2741ff7b6ed73f26c103b087bae6d4 # [cross_target_platform == "linux-ppc64le"]
sha256: df20862810f932edd2ec7498cf7eb66a9e7530761b49970d1f38710856a3b39f # [cross_target_platform == "linux-s390x"]
url: {{ rpm_url }}/glibc-gconv-extra-2.34-83.el9_3.12.{{ centos_machine }}.rpm
sha256: 63f533893833bcfdcf5e930ed86798fd94a4067be07ab848703729c171ecd0c0 # [cross_target_platform == "linux-64"]
sha256: 904fe57436ac2a5bece23bee28cc5c1553aa7837bb17cb55804d2833ce3b7c2b # [cross_target_platform == "linux-aarch64"]
sha256: 48b89589e90b1ccaa80a4efc8e7b231d39561c595e4ea39461d91c3d84269cf8 # [cross_target_platform == "linux-ppc64le"]
sha256: 486cb2b877c9e127019c6f92fac89c6ce438b7427ba1f012de54ca33355ecd2e # [cross_target_platform == "linux-s390x"]

- folder: binary-glibc-headers # [cross_target_platform in ("linux-64", "linux-s390x")]
url: {{ appstream_rpm_url }}/glibc-headers-2.34-83.el9_3.12.{{ centos_machine }}.rpm # [cross_target_platform in ("linux-64", "linux-s390x")]
sha256: 28e0b6aa9c9a52cb58e62cd5ab0be002414c4bbf561f140f874f4e9058b90d4f # [cross_target_platform == "linux-64"]
sha256: d9f67d8a72f7ea715dc18bb7aad776cd3df3d5154cbe8572b38034bca5bc802d # [cross_target_platform == "linux-s390x"]

- folder: binary-glibc-nss-devel
url: {{ powertools_rpm_url }}/glibc-nss-devel-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: 777d14a317846edd4d52bea859ec7a99b72fd100eca423ef7882ebf19866feff # [cross_target_platform == "linux-64"]
sha256: 1040b1dab8435d009d340c4aca3938c7f1fc8baf9c81bcee1f6acfcc6aec2c31 # [cross_target_platform == "linux-aarch64"]
sha256: c2b92662dad3a58e81b089c894868ebbeaf31b0945f590fc46644c46bc8be55b # [cross_target_platform == "linux-ppc64le"]
sha256: 5750e669f2dc48e02d4f9213e0c7ca232a45d79605827fe00913afdb0d7ae039 # [cross_target_platform == "linux-s390x"]
url: {{ crb_rpm_url }}/glibc-nss-devel-2.34-83.el9_3.12.{{ centos_machine }}.rpm
sha256: da773402abd25cda4311e62ee115c2bf8acac3626b66f2c0fbe1bbba43d2df46 # [cross_target_platform == "linux-64"]
sha256: c9b156b6e42aac6fc862f98431a8b5d3aa669e92d2235091899b795b1d66ce7d # [cross_target_platform == "linux-aarch64"]
sha256: 4b42d61d3fb2b4c6ec25ceffcf1e70fe20c64f05970ab2ce87ed530f81d16eab # [cross_target_platform == "linux-ppc64le"]
sha256: c90d9b9d294a7f7232c26d2e15e09f0fce977a2cb7c433a8d3e244476c65109a # [cross_target_platform == "linux-s390x"]

- folder: binary-glibc-static
url: {{ powertools_rpm_url }}/glibc-static-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: e62d95f6222546cc3ecc19fd17a1eb35740ef9d489244635a3f54efa001b9d50 # [cross_target_platform == "linux-64"]
sha256: 39e095652d8e2a4373a1fef933080bf09a75d267ff6efff40d962a841788c4ea # [cross_target_platform == "linux-aarch64"]
sha256: 182084336d5870c606633e479fa7ffc06ff0f1ebecc79909264df39877e2a6d5 # [cross_target_platform == "linux-ppc64le"]
sha256: c3ac2c243a879e985a5ee9669c998374908e6f083d4a96586b028862075485cc # [cross_target_platform == "linux-s390x"]
url: {{ crb_rpm_url }}/glibc-static-2.34-83.el9_3.12.{{ centos_machine }}.rpm
sha256: 753eacb9062f03b62a7b2d6b02fd9424ba9e17124640724fabd83103b10074d7 # [cross_target_platform == "linux-64"]
sha256: daa5969753775b51e05ddd6276f295dffe5161793b877dd39344296c5a9c8aa3 # [cross_target_platform == "linux-aarch64"]
sha256: 9a3fb2dad17880bc82eee0ab271bfd6b59209d148f075d9d3710d6a7ea334b4c # [cross_target_platform == "linux-ppc64le"]
sha256: 9f575d66162b0c87271a34c42a54af937401db8a50eaa87beda578cc0bdde170 # [cross_target_platform == "linux-s390x"]

- folder: binary-kernel-headers
url: {{ rpm_url }}/kernel-headers-4.18.0-513.24.1.el8_9.{{ centos_machine }}.rpm
sha256: 1da03ae05118d6e42bd26efd5a0770d30362109731cbd5bdaef9e0a4f01a7659 # [cross_target_platform == "linux-64"]
sha256: 28cc76582fb17f7c557aa95d4b2a364113c019ffdf2e95efb5232da8873b977c # [cross_target_platform == "linux-aarch64"]
sha256: 47019f21239170869460c073a54adae5508e45284c10d22b7c9fbff1e8436269 # [cross_target_platform == "linux-ppc64le"]
sha256: aabf8d0539f1cdf5067d13cbfc8fdfa8223a90cafae159da84eea29bcb31cc1e # [cross_target_platform == "linux-s390x"]
url: {{ appstream_rpm_url }}/kernel-headers-5.14.0-362.24.2.el9_3.{{ centos_machine }}.rpm
sha256: 336ae02ba2aafaec09c52d79ccdb8c71562790c137acde413416925ad55d1e02 # [cross_target_platform == "linux-64"]
sha256: 1e35a540a5f4fc017c4caf8f44979e2959813ab4c1ebc9a464af7ade2738b6e5 # [cross_target_platform == "linux-aarch64"]
sha256: 9a12ccefcb5289eed6479a7fb9dc73c19096e170a6bef0757d438fbe063ae349 # [cross_target_platform == "linux-ppc64le"]
sha256: 1c5597d50bba7adf24d2f291fea0d4683bdd85ea9b2a275e5674290ad84dbce8 # [cross_target_platform == "linux-s390x"]

- folder: binary-nss_db
url: {{ rpm_url }}/nss_db-2.28-236.el8_9.13.{{ centos_machine }}.rpm
sha256: 4e57caeaaeabe2e5644ae62dc79642fb612b8176c54d1af3922a60a686a15824 # [cross_target_platform == "linux-64"]
sha256: 054f2572db4e5dee49ad37315779aea01021b37322d4ba7cacf44d478c0f9eb1 # [cross_target_platform == "linux-aarch64"]
sha256: 3b5a1169f2e85c22bc1e89e789cefd1844ae74693618d4d095023a00414f6c06 # [cross_target_platform == "linux-ppc64le"]
sha256: 694d74694f8cdbb7ed6141808fa177f119dce7d666f8c47d9e4fedd3fc980d86 # [cross_target_platform == "linux-s390x"]

- folder: binary-nss_nis
url: {{ rpm_url }}/nss_nis-3.0-8.el8.{{ centos_machine }}.rpm
sha256: 092ae0b3db08c0bd8af1187f37abf426af9092495f3276bd186c90679f342e59 # [cross_target_platform == "linux-64"]
sha256: 3c7fe091fcef8971b5de41b9093025405d2064fb05e5c510ec3a92454f49e2be # [cross_target_platform == "linux-aarch64"]
sha256: 360f1582f13e9e86e4812446bbb0b2ae7e5477459e381c0475f04a0afff9fee6 # [cross_target_platform == "linux-ppc64le"]
sha256: 4515b05ba15ce464aaf445516817194b3f95849db5394acd6ccf67f5c2fc515a # [cross_target_platform == "linux-s390x"]
url: {{ crb_rpm_url }}/nss_db-2.34-83.el9_3.12.{{ centos_machine }}.rpm
sha256: afb7b7623fe37a496c93c0532d0efa09ef3bb59afda90d29e0675988525c2e6c # [cross_target_platform == "linux-64"]
sha256: 78f373c7326febf9ba8973491b4f8578e1d46d1f5e05391ccdae2c770c2c77e4 # [cross_target_platform == "linux-aarch64"]
sha256: 6c74f8b2381c1d34c2019a4ff25072086ab121baea57e641bbf54edf77a7e3c5 # [cross_target_platform == "linux-ppc64le"]
sha256: e604355ce87ebe6421908bbc07f3a0f5e8d9367d88e80948283154134bfcb6c7 # [cross_target_platform == "linux-s390x"]

- folder: binary-nss-softokn-freebl
url: {{ appstream_rpm_url }}/nss-softokn-freebl-3.90.0-6.el8_9.{{ centos_machine }}.rpm
sha256: 53bcc5c46f4b951a19469b22693718110ec2c4ffb1ffd8ae416aaa0848800ebd # [cross_target_platform == "linux-64"]
sha256: 18abf6ae89d959b8fce384af7c77c2480a4e0f53c05636c79efea2f98c1c8c91 # [cross_target_platform == "linux-aarch64"]
sha256: b16e029528112e6b3076bab7ec899fdd09567f2031583178683a1a6a2e6c0d2a # [cross_target_platform == "linux-ppc64le"]
sha256: bc1689f6f34b1c26ac4f1b6143ff78d9fb76f90d52dcb0a0b070d41003bef9f8 # [cross_target_platform == "linux-s390x"]

url: {{ appstream_rpm_url }}/nss-softokn-freebl-3.90.0-7.el9_3.{{ centos_machine }}.rpm
sha256: 123708986c57400dc9ffef906b9ecd138e304b437500d66759cfcf5eafcd81be # [cross_target_platform == "linux-64"]
sha256: 42c5ba072a5847031bd669bedbb17375349038afbe1db4a8a5dbcf7e12291e7c # [cross_target_platform == "linux-aarch64"]
sha256: b10edf0d66aacfd179d8f7ee1a6bb8ab12988ce6e66af930a6100a4526c036c0 # [cross_target_platform == "linux-ppc64le"]
sha256: 4179f09b84bbe4b6aed3653bffd492f93860f64037f3bca30e3688ccffd11ecc # [cross_target_platform == "linux-s390x"]
# END source

build:
Expand Down Expand Up @@ -132,6 +121,7 @@ outputs:
track_features:
- sysroot_{{ cross_target_platform }}_{{ glibc_version }}
- sysroot_{{ cross_target_platform }}_{{ glibc_version }}_feature_2
- sysroot_{{ cross_target_platform }}_{{ glibc_version }}_feature_3
run_exports:
strong:
- __glibc >={{ glibc_version }},<3.0.a0
Expand Down
Loading