Skip to content

Commit dc08da0

Browse files
authored
chore: roll sysroots to c2d6a65 (#59)
* 6574317: sysroot_creator: add riscv64 support https://chromium-review.googlesource.com/c/chromium/src/+/6574317 * 6574441: reversion_glibc: add riscv64 support https://chromium-review.googlesource.com/c/chromium/src/+/6574441 * 6603814: [Sysroot] Fix build_and_upload.py https://chromium-review.googlesource.com/c/chromium/src/+/6603814 * 6629552: [Sysroot] remove sys/hwprobe.h for riscv64 https://chromium-review.googlesource.com/c/chromium/src/+/6629552 * 6629553: [sysroot] Add riscv64 support https://chromium-review.googlesource.com/c/chromium/src/+/6629553 * chore: bump current SHA * chore: update docs and CI * chore: update .gitignore
1 parent f235727 commit dc08da0

File tree

17 files changed

+859
-71
lines changed

17 files changed

+859
-71
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Build
1919
strategy:
2020
matrix:
21-
arch: [amd64, i386, armhf, arm64, mipsel, mips64el, ppc64el]
21+
arch: [amd64, i386, armhf, arm64, mipsel, mips64el, ppc64el, riscv64]
2222
fail-fast: false
2323
runs-on: ubuntu-latest
2424
steps:
@@ -27,16 +27,23 @@ jobs:
2727
- name: Install Packages
2828
run: |
2929
sudo apt update
30-
sudo apt install -y binutils-aarch64-linux-gnu binutils-arm-linux-gnueabi binutils-arm-linux-gnueabihf binutils-mips64el-linux-gnuabi64 binutils-mipsel-linux-gnu binutils-powerpc64le-linux-gnu
30+
sudo apt install -y \
31+
binutils-aarch64-linux-gnu \
32+
binutils-arm-linux-gnueabi \
33+
binutils-arm-linux-gnueabihf \
34+
binutils-mips64el-linux-gnuabi64 \
35+
binutils-mipsel-linux-gnu \
36+
binutils-powerpc64le-linux-gnu \
37+
binutils-riscv64-linux-gnu
3138
- name: Install dependencies
3239
run: python3 -m pip install --upgrade requests
3340
- name: Build Sysroot
3441
run: ./build/linux/sysroot_scripts/sysroot_creator.py build ${{ matrix.arch }}
3542
- name: Upload Sysroot Artifact
3643
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # 4.2.6
3744
with:
38-
name: debian_bullseye_${{ matrix.arch }}_sysroot.tar.xz
39-
path: out/sysroot-build/bullseye/debian_bullseye_${{ matrix.arch }}_sysroot.tar.xz
45+
name: ${{ matrix.arch == 'riscv64' && 'debian_trixie_' || 'debian_bullseye_' }}${{ matrix.arch }}_sysroot.tar.xz
46+
path: ${{ matrix.arch == 'riscv64' && 'out/sysroot-build/trixie/debian_trixie_' || 'out/sysroot-build/bullseye/debian_bullseye_' }}${{ matrix.arch }}_sysroot.tar.xz
4047
upload:
4148
name: Upload Sysroots to Azure
4249
runs-on: ubuntu-latest

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/out
2+
build/linux/sysroot_scripts/__pycache__/

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ At the moment, we build the following sysroots:
2929
* `mipsel`
3030
* `mips64el`
3131
* `ppc64el`
32+
* `riscv64`
3233

3334
## Building A Single Sysroot
3435

@@ -40,6 +41,8 @@ To build a single sysroot, run:
4041

4142
This will build the desire sysroot in `<arch>` at `out/sysroot-build/bullseye/debian_bullseye_<arch>_sysroot.tar.xz`, e.g. `out/sysroot-build/bullseye/debian_bullseye_amd64_sysroot.tar.xz`.
4243

44+
**Note:** riscv64 officially becomes supported in Debian trixie release, so `riscv64` will result in the sysroot being built at `out/sysroot-build/trixie/debian_trixie_<arch>_sysroot.tar.xz`
45+
4346
## Building All Sysroots
4447

4548
To build all sysroots at once, run:

build/linux/sysroot_scripts/build_and_upload.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def build_and_upload(key, arch, lock, action):
3434

3535
tarball = "%s_%s_%s_sysroot.tar.xz" % (
3636
sysroot_creator.DISTRO,
37-
sysroot_creator.RELEASE,
37+
sysroot_creator.RELEASES[arch],
3838
arch.lower(),
3939
)
4040
tarxz_path = os.path.join(
@@ -44,13 +44,13 @@ def build_and_upload(key, arch, lock, action):
4444
"..",
4545
"out",
4646
"sysroot-build",
47-
sysroot_creator.RELEASE,
47+
sysroot_creator.RELEASES[arch],
4848
tarball,
4949
)
5050
sha256sum = sysroot_creator.sha256sumfile(tarxz_path)
5151
sysroot_dir = "%s_%s_%s-sysroot" % (
5252
sysroot_creator.DISTRO,
53-
sysroot_creator.RELEASE,
53+
sysroot_creator.RELEASES[arch],
5454
arch.lower(),
5555
)
5656

@@ -65,7 +65,7 @@ def build_and_upload(key, arch, lock, action):
6565
fname = os.path.join(script_dir, "sysroots.json")
6666
sysroots = json.load(open(fname))
6767
with open(fname, "w") as f:
68-
sysroots["%s_%s" % (sysroot_creator.RELEASE,
68+
sysroots["%s_%s" % (sysroot_creator.RELEASES[arch],
6969
arch.lower())] = sysroot_metadata
7070
f.write(
7171
json.dumps(sysroots,
@@ -88,7 +88,7 @@ def main(action):
8888
)
8989
procs.append((
9090
"%s %s (%s)" %
91-
(sysroot_creator.DISTRO, sysroot_creator.RELEASE, arch),
91+
(sysroot_creator.DISTRO, sysroot_creator.RELEASES[arch], arch),
9292
proc,
9393
))
9494
proc.start()

build/linux/sysroot_scripts/generated_package_lists/bullseye.amd64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/
136136
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1+deb11u4_amd64.deb
137137
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc-dev-bin_2.31-13+deb11u5_amd64.deb
138138
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dbg_2.31-13+deb11u5_amd64.deb
139-
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u11_amd64.deb
140139
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u5_amd64.deb
141140
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6_2.31-13+deb11u5_amd64.deb
142141
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/gmp/libgmp-dev_6.2.1+dfsg-1+deb11u1_amd64.deb
@@ -592,6 +591,7 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-lin
592591
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/mount_2.36.1-8+deb11u2_amd64.deb
593592
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/util-linux_2.36.1-8+deb11u2_amd64.deb
594593
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u2_amd64.deb
594+
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind-if-available/valgrind-if-available_3.18.1-1-1_amd64.deb
595595
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind/valgrind_3.16.1-1_amd64.deb
596596
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan-dev_1.3.224.0-1~bpo11+1_amd64.deb
597597
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan1_1.3.224.0-1~bpo11+1_amd64.deb

build/linux/sysroot_scripts/generated_package_lists/bullseye.arm64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/
135135
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1+deb11u4_arm64.deb
136136
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc-dev-bin_2.31-13+deb11u5_arm64.deb
137137
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dbg_2.31-13+deb11u5_arm64.deb
138-
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u11_arm64.deb
139138
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u5_arm64.deb
140139
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6_2.31-13+deb11u5_arm64.deb
141140
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/gmp/libgmp-dev_6.2.1+dfsg-1+deb11u1_arm64.deb
@@ -591,6 +590,7 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-lin
591590
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/mount_2.36.1-8+deb11u2_arm64.deb
592591
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/util-linux_2.36.1-8+deb11u2_arm64.deb
593592
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u2_arm64.deb
593+
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind-if-available/valgrind-if-available_3.18.1-1-1_arm64.deb
594594
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind/valgrind_3.16.1-1_arm64.deb
595595
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan-dev_1.3.224.0-1~bpo11+1_arm64.deb
596596
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan1_1.3.224.0-1~bpo11+1_arm64.deb

build/linux/sysroot_scripts/generated_package_lists/bullseye.armhf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/
132132
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1+deb11u4_armhf.deb
133133
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc-dev-bin_2.31-13+deb11u5_armhf.deb
134134
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dbg_2.31-13+deb11u5_armhf.deb
135-
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u11_armhf.deb
136135
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u5_armhf.deb
137136
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6_2.31-13+deb11u5_armhf.deb
138137
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/gmp/libgmp-dev_6.2.1+dfsg-1+deb11u1_armhf.deb
@@ -586,6 +585,7 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-lin
586585
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/mount_2.36.1-8+deb11u2_armhf.deb
587586
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/util-linux_2.36.1-8+deb11u2_armhf.deb
588587
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u2_armhf.deb
588+
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind-if-available/valgrind-if-available_3.18.1-1-1_armhf.deb
589589
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind/valgrind_3.16.1-1_armhf.deb
590590
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan-dev_1.3.224.0-1~bpo11+1_armhf.deb
591591
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan1_1.3.224.0-1~bpo11+1_armhf.deb

build/linux/sysroot_scripts/generated_package_lists/bullseye.i386

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/
134134
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1+deb11u4_i386.deb
135135
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc-dev-bin_2.31-13+deb11u5_i386.deb
136136
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dbg_2.31-13+deb11u5_i386.deb
137-
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u11_i386.deb
138137
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u5_i386.deb
139138
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6_2.31-13+deb11u5_i386.deb
140139
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/gmp/libgmp-dev_6.2.1+dfsg-1+deb11u1_i386.deb
@@ -589,6 +588,7 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-lin
589588
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/mount_2.36.1-8+deb11u2_i386.deb
590589
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/util-linux_2.36.1-8+deb11u2_i386.deb
591590
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u2_i386.deb
591+
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind-if-available/valgrind-if-available_3.18.1-1-1_i386.deb
592592
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind/valgrind_3.16.1-1_i386.deb
593593
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan-dev_1.3.224.0-1~bpo11+1_i386.deb
594594
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan1_1.3.224.0-1~bpo11+1_i386.deb

build/linux/sysroot_scripts/generated_package_lists/bullseye.mips64el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/
130130
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1+deb11u4_mips64el.deb
131131
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc-dev-bin_2.31-13+deb11u5_mips64el.deb
132132
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dbg_2.31-13+deb11u5_mips64el.deb
133-
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u11_mips64el.deb
134133
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u5_mips64el.deb
135134
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6_2.31-13+deb11u5_mips64el.deb
136135
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/gmp/libgmp-dev_6.2.1+dfsg-1+deb11u1_mips64el.deb
@@ -583,6 +582,7 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-lin
583582
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/mount_2.36.1-8+deb11u2_mips64el.deb
584583
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/util-linux_2.36.1-8+deb11u2_mips64el.deb
585584
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u2_mips64el.deb
585+
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind-if-available/valgrind-if-available_3.18.1-1-1_mips64el.deb
586586
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind/valgrind_3.16.1-1_mips64el.deb
587587
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan-dev_1.3.224.0-1~bpo11+1_mips64el.deb
588588
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan1_1.3.224.0-1~bpo11+1_mips64el.deb

build/linux/sysroot_scripts/generated_package_lists/bullseye.mipsel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/
129129
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/libglib2.0-dev-bin_2.66.8-1+deb11u4_mipsel.deb
130130
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glib2.0/libglib2.0-dev_2.66.8-1+deb11u4_mipsel.deb
131131
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc-dev-bin_2.31-13+deb11u5_mipsel.deb
132-
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dbg_2.31-13+deb11u5_mipsel.deb
133-
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u11_mipsel.deb
134132
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u5_mipsel.deb
135133
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/glibc/libc6_2.31-13+deb11u5_mipsel.deb
136134
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/g/gmp/libgmp-dev_6.2.1+dfsg-1+deb11u1_mipsel.deb
@@ -583,7 +581,7 @@ https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-lin
583581
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/mount_2.36.1-8+deb11u2_mipsel.deb
584582
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/util-linux_2.36.1-8+deb11u2_mipsel.deb
585583
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u2_mipsel.deb
586-
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind/valgrind_3.16.1-1_mipsel.deb
584+
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/valgrind-if-available/valgrind-if-available_3.18.1-1-1_mipsel.deb
587585
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan-dev_1.3.224.0-1~bpo11+1_mipsel.deb
588586
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/v/vulkan-loader/libvulkan1_1.3.224.0-1~bpo11+1_mipsel.deb
589587
https://snapshot.debian.org/archive/debian/20250129T203412Z/pool/main/w/wavpack/libwavpack1_5.4.0-1_mipsel.deb

0 commit comments

Comments
 (0)