From 2a9bd220811a2aadab57eff870a16ff0485fefb1 Mon Sep 17 00:00:00 2001
From: Fei Yang <fyang@openjdk.org>
Date: Fri, 1 Nov 2024 09:32:25 +0000
Subject: [PATCH] 8342578: GHA: RISC-V: Bootstrap using Debian snapshot is
still failing
Backport-of: 239d84a82a1e6f4ebbd5c5abb320e39cfd5bc330
---
.github/workflows/build-cross-compile.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build-cross-compile.yml b/.github/workflows/build-cross-compile.yml
index dbeb3d45154..e79c408b656 100644
--- a/.github/workflows/build-cross-compile.yml
+++ b/.github/workflows/build-cross-compile.yml
@@ -84,7 +84,7 @@ jobs:
- target-cpu: riscv64
gnu-arch: riscv64
debian-arch: riscv64
- debian-repository: https://snapshot.debian.org/archive/debian/20240228T034848Z/
+ debian-repository: https://httpredir.debian.org/debian/
debian-version: sid
tolerate-sysroot-errors: true
@@ -131,6 +131,7 @@ jobs:
id: create-sysroot
run: >
sudo debootstrap
+ --no-merged-usr
--arch=${{ matrix.debian-arch }}
--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
@@ -151,6 +152,9 @@ jobs:
rm -rf sysroot/usr/{sbin,bin,share}
rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
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'
- name: 'Remove broken sysroot'
--
GitLab