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

ENH glibc 2.28 from alma8 #47

Merged
merged 47 commits into from
May 23, 2023
Merged
Changes from 3 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
042b4f5
WIP update one for starters
beckermr Apr 23, 2023
3d30347
all arches now get crdh and features
beckermr Apr 23, 2023
ad1c024
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Apr 23, 2023
f866a6e
more hashes and rpm locations
beckermr Apr 24, 2023
009223f
Merge branch 'alma-8' of https://github.com/beckermr/linux-sysroot-fe…
beckermr Apr 24, 2023
c00130e
maybe a jinja2 bug
beckermr Apr 24, 2023
be5b3eb
adjust scripts to adapt to new layout
beckermr Apr 24, 2023
df52c38
really dumb bash error
beckermr Apr 24, 2023
3774945
try this
beckermr Apr 24, 2023
b15fe8c
wow I am bad at bash
beckermr Apr 24, 2023
add3507
force these
beckermr Apr 24, 2023
d83adf1
try again
beckermr Apr 24, 2023
394272f
put freebl there
beckermr Apr 24, 2023
33787af
again try again
beckermr Apr 24, 2023
4735c8e
keep the artifacts
beckermr Apr 24, 2023
72cf9c3
more debugging
beckermr Apr 24, 2023
2b4a669
bug in symlink
beckermr Apr 24, 2023
db0cb4e
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Apr 25, 2023
a902f3d
add glibc-langpacks for locale info
beckermr Apr 25, 2023
160c63f
STY fix jinja2 lint
beckermr Apr 25, 2023
40ef003
try this madness
beckermr Apr 25, 2023
41d6828
less for debugging
beckermr Apr 25, 2023
b7ca00f
move the langpacks to separate package
beckermr Apr 25, 2023
f828a80
add links to match old layout again
beckermr Apr 25, 2023
e1a0138
add hashes for aarch64
beckermr Apr 25, 2023
5e6e82a
we only need en in the base sysroot
beckermr Apr 25, 2023
a0a0cc8
add mssing nss files
beckermr Apr 25, 2023
9135df6
buggy jinja2
beckermr Apr 25, 2023
8b29cc5
Update recipe/meta.yaml
beckermr Apr 25, 2023
3ee5903
fix the shas and add a bit more
beckermr Apr 25, 2023
9a8c1fc
Merge branch 'alma-8' of https://github.com/beckermr/linux-sysroot-fe…
beckermr Apr 25, 2023
3ee25a5
add this gem back
beckermr Apr 25, 2023
de66593
Update recipe/meta.yaml
beckermr Apr 25, 2023
6d3437a
layout is wrong
beckermr Apr 25, 2023
99b3029
remove hacks
beckermr Apr 25, 2023
ee0a425
Merge branch 'alma-8' of https://github.com/beckermr/linux-sysroot-fe…
beckermr Apr 25, 2023
ca893ed
Update recipe/build-langpacks.sh
beckermr Apr 26, 2023
a7c8148
wrong layout again
beckermr Apr 26, 2023
29a427b
make usr directory duh
beckermr Apr 26, 2023
d7c5e56
Update recipe/build-sysroot.sh
beckermr Apr 26, 2023
d978476
Update recipe/build-langpacks.sh
beckermr Apr 26, 2023
ee2c8df
Update recipe/build-sysroot.sh
beckermr Apr 26, 2023
20ac0a5
Update recipe/gen_rpm_shas.py
beckermr Apr 26, 2023
24d0c34
REF ship all langpacks
beckermr May 16, 2023
aec36a2
Merge branch 'alma-8' of https://github.com/beckermr/linux-sysroot-fe…
beckermr May 16, 2023
ee7a623
Update build-sysroot.sh
beckermr May 23, 2023
c632abe
Update recipe/build-sysroot.sh
beckermr May 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 5 additions & 13 deletions recipe/build-sysroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ 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/
cp -Rf "${SRC_DIR}"/binary-glibc-common/* .
cp -Rf "${SRC_DIR}"/binary-glibc-langpack-en/* .
cp -Rf "${SRC_DIR}"/binary-glibc-nss-devel/* .
cp -Rf "${SRC_DIR}"/binary-glibc-common/* usr/
cp -Rf "${SRC_DIR}"/binary-glibc-langpack-en/* usr/
cp -Rf "${SRC_DIR}"/binary-glibc-nss-devel/* usr/
cp -Rf "${SRC_DIR}"/binary-nss_db/* .
cp -Rf "${SRC_DIR}"/binary-nss_nis/* .
cp -Rf "${SRC_DIR}"/binary-glibc-gconv-extra/* .
cp -Rf "${SRC_DIR}"/binary-nss_nis/* usr/.
beckermr marked this conversation as resolved.
Show resolved Hide resolved
beckermr marked this conversation as resolved.
Show resolved Hide resolved
cp -Rf "${SRC_DIR}"/binary-glibc-gconv-extra/* usr/
cp -Rf "${SRC_DIR}"/binary-libxcrypt/* .
cp -Rf "${SRC_DIR}"/binary-libxcrypt-devel/* .

Expand Down Expand Up @@ -45,14 +45,6 @@ rm -f usr/include/rpcsvc/yp.x

cp "${SRC_DIR}"/binary-freebl/lib64/libfreebl3.so ${PWD}/lib64/.

# the locales have moved - making a sym link to the old area
ln -s $PWD/share/locale $PWD/usr/share/locale

# usr/bin is different?
rm -f $PWD/bin/ld.so
ln -s $PWD/lib64/ld-2.28.so $PWD/bin/ld.so
ln -s $PWD/bin $PWD/usr/bin

if [[ "$target_machine" == "s390x" ]]; then
rm -rf $PWD/lib64/ld64.so.1
ln -s $PWD/lib64/ld-* $PWD/lib64/ld64.so.1
Expand Down