8342578: GHA: RISC-V: Bootstrap using Debian snapshot is still failing
Reviewed-by: shade, erikj
This commit is contained in:
parent
aa060f22d3
commit
239d84a82a
6
.github/workflows/build-cross-compile.yml
vendored
6
.github/workflows/build-cross-compile.yml
vendored
@ -84,7 +84,7 @@ jobs:
|
|||||||
- target-cpu: riscv64
|
- target-cpu: riscv64
|
||||||
gnu-arch: riscv64
|
gnu-arch: riscv64
|
||||||
debian-arch: riscv64
|
debian-arch: riscv64
|
||||||
debian-repository: https://snapshot.debian.org/archive/debian/20240228T034848Z/
|
debian-repository: https://httpredir.debian.org/debian/
|
||||||
debian-version: sid
|
debian-version: sid
|
||||||
tolerate-sysroot-errors: true
|
tolerate-sysroot-errors: true
|
||||||
|
|
||||||
@ -131,6 +131,7 @@ jobs:
|
|||||||
id: create-sysroot
|
id: create-sysroot
|
||||||
run: >
|
run: >
|
||||||
sudo debootstrap
|
sudo debootstrap
|
||||||
|
--no-merged-usr
|
||||||
--arch=${{ matrix.debian-arch }}
|
--arch=${{ matrix.debian-arch }}
|
||||||
--verbose
|
--verbose
|
||||||
--include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
|
--include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
|
||||||
@ -151,6 +152,9 @@ jobs:
|
|||||||
rm -rf sysroot/usr/{sbin,bin,share}
|
rm -rf sysroot/usr/{sbin,bin,share}
|
||||||
rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
|
rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
|
||||||
rm -rf sysroot/usr/libexec/gcc
|
rm -rf sysroot/usr/libexec/gcc
|
||||||
|
# /{bin,sbin,lib}/ are not symbolic links to /usr/{bin,sbin,lib}/ when debootstrap with --no-merged-usr
|
||||||
|
rm -rf sysroot/{sbin,bin}
|
||||||
|
rm -rf sysroot/lib/{udev,systemd}
|
||||||
if: steps.create-sysroot.outcome == 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
|
if: steps.create-sysroot.outcome == 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
|
||||||
|
|
||||||
- name: 'Remove broken sysroot'
|
- name: 'Remove broken sysroot'
|
||||||
|
Loading…
Reference in New Issue
Block a user