Recreate usrmerge links in the x64 sysroot.
Some checks failed
Tagged release / prepare-release (push) Successful in 3m0s
Tagged release / build-linux-x64 (push) Failing after 28m51s
Tagged release / build-macos (push) Has been skipped
Tagged release / build-linux-arm64 (push) Has been skipped
Tagged release / build-windows (push) Has been skipped
Tagged release / publish-release (push) Has been skipped
Some checks failed
Tagged release / prepare-release (push) Successful in 3m0s
Tagged release / build-linux-x64 (push) Failing after 28m51s
Tagged release / build-macos (push) Has been skipped
Tagged release / build-linux-arm64 (push) Has been skipped
Tagged release / build-windows (push) Has been skipped
Tagged release / publish-release (push) Has been skipped
This commit is contained in:
@@ -80,6 +80,12 @@ case "$target" in
|
|||||||
sudo dpkg-deb --extract "$package" "$sysroot"
|
sudo dpkg-deb --extract "$package" "$sysroot"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Recreate Ubuntu's merged-/usr root links. libc development linker
|
||||||
|
# scripts refer to /lib paths, while libc6 stores the files in
|
||||||
|
# /usr/lib; --sysroot expects the same links as a complete rootfs.
|
||||||
|
sudo ln -s usr/lib "$sysroot/lib"
|
||||||
|
sudo ln -s usr/lib64 "$sysroot/lib64"
|
||||||
|
|
||||||
# Architecture-independent development packages may already be
|
# Architecture-independent development packages may already be
|
||||||
# installed on the host, so apt does not download them again. Their
|
# installed on the host, so apt does not download them again. Their
|
||||||
# pkg-config files contain no host binaries and are safe to reuse with
|
# pkg-config files contain no host binaries and are safe to reuse with
|
||||||
|
|||||||
@@ -195,6 +195,8 @@ fn tagged_releases_are_built_and_packaged_with_rust_tools() {
|
|||||||
"Architectures: arm64",
|
"Architectures: arm64",
|
||||||
"--download-only",
|
"--download-only",
|
||||||
"dpkg-deb --extract",
|
"dpkg-deb --extract",
|
||||||
|
"ln -s usr/lib \"$sysroot/lib\"",
|
||||||
|
"ln -s usr/lib64 \"$sysroot/lib64\"",
|
||||||
"/usr/share/pkgconfig/.",
|
"/usr/share/pkgconfig/.",
|
||||||
"/opt/ruds-x64-sysroot",
|
"/opt/ruds-x64-sysroot",
|
||||||
] {
|
] {
|
||||||
|
|||||||
Reference in New Issue
Block a user