Skip to content

Commit 8700c07

Browse files
martin4861martin4861
committed
Change to bookworm
1 parent 9576a06 commit 8700c07

File tree

7 files changed

+52
-33
lines changed

7 files changed

+52
-33
lines changed

‎.github/workflows/bullseye-aarch64-sysroot.yaml‎ renamed to ‎.github/workflows/bookworm-aarch64-sysroot.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
name: bullseye-aarch64 sysroot
2+
name: bookworm-aarch64 sysroot
33
on:
44
pull_request:
55
paths:
66
- "sysroot/**"
7-
- .github/workflows/bullseye-aarch64-sysroot.yaml
7+
- .github/workflows/bookworm-aarch64-sysroot.yaml
88
push:
99
tags:
10-
- "bullseye-sysroot-*"
10+
- "bookworm-sysroot-*"
1111

1212
jobs:
1313
toolchains:
1414
runs-on: ubuntu-22.04
15-
name: bullseye-aarch64 sysroot
15+
name: bookworm-aarch64 sysroot
1616
steps:
1717
- name: Checkout source
1818
uses: actions/checkout@v2
@@ -23,8 +23,8 @@ jobs:
2323
- name: Upload sysroot
2424
uses: actions/upload-artifact@v3
2525
with:
26-
name: debian_bullseye_aarch64_sysroot.tar.xz
27-
path: sysroot/out/sysroot-build/bullseye/debian_bullseye_arm64_sysroot.tar.xz
26+
name: debian_bookworm_aarch64_sysroot.tar.xz
27+
path: sysroot/out/sysroot-build/bookworm/debian_bookworm_arm64_sysroot.tar.xz
2828

2929
- uses: bazelbuild/setup-bazelisk@v2
3030

@@ -35,7 +35,7 @@ jobs:
3535
key: bazel
3636

3737
- name: Copy sysroot
38-
run: cp sysroot/out/sysroot-build/bullseye/debian_bullseye_arm64_sysroot.tar.xz debian_bullseye_aarch64_sysroot.tar.xz
38+
run: cp sysroot/out/sysroot-build/bookworm/debian_bookworm_arm64_sysroot.tar.xz debian_bookworm_aarch64_sysroot.tar.xz
3939

4040
- name: Test sysroot
4141
run: bazel build --config=aarch64_sysroot //sysroot/...
@@ -45,7 +45,7 @@ jobs:
4545
uses: svenstaro/upload-release-action@v1-release
4646
with:
4747
repo_token: ${{ secrets.GITHUB_TOKEN }}
48-
file: "sysroot/out/sysroot-build/bullseye/debian_bullseye_arm64_sysroot.tar.xz"
48+
file: "sysroot/out/sysroot-build/bookworm/debian_bookworm_arm64_sysroot.tar.xz"
4949
tag: ${{ github.ref }}
50-
asset_name: debian_bullseye_aarch64_sysroot.tar.xz
50+
asset_name: debian_bookworm_aarch64_sysroot.tar.xz
5151
overwrite: true

‎.github/workflows/bullseye-x86_64-sysroot.yaml‎ renamed to ‎.github/workflows/bookworm-x86_64-sysroot.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
name: bullseye-x86_64 sysroot
2+
name: bookworm-x86_64 sysroot
33
on:
44
pull_request:
55
paths:
66
- "sysroot/**"
7-
- .github/workflows/bullseye-x86_64-sysroot.yaml
7+
- .github/workflows/bookworm-x86_64-sysroot.yaml
88
push:
99
tags:
10-
- "bullseye-sysroot-*"
10+
- "bookworm-sysroot-*"
1111

1212
jobs:
1313
toolchains:
1414
runs-on: ubuntu-22.04
15-
name: bullseye-x86_64 sysroot
15+
name: bookworm-x86_64 sysroot
1616
steps:
1717
- name: Checkout source
1818
uses: actions/checkout@v2
@@ -23,8 +23,8 @@ jobs:
2323
- name: Upload sysroot
2424
uses: actions/upload-artifact@v3
2525
with:
26-
name: debian_bullseye_x86_64_sysroot.tar.xz
27-
path: sysroot/out/sysroot-build/bullseye/debian_bullseye_amd64_sysroot.tar.xz
26+
name: debian_bookworm_x86_64_sysroot.tar.xz
27+
path: sysroot/out/sysroot-build/bookworm/debian_bookworm_amd64_sysroot.tar.xz
2828

2929
- uses: bazelbuild/setup-bazelisk@v2
3030

@@ -35,7 +35,7 @@ jobs:
3535
key: bazel
3636

3737
- name: Copy sysroot
38-
run: cp sysroot/out/sysroot-build/bullseye/debian_bullseye_amd64_sysroot.tar.xz debian_bullseye_x86_64_sysroot.tar.xz
38+
run: cp sysroot/out/sysroot-build/bookworm/debian_bookworm_amd64_sysroot.tar.xz debian_bookworm_x86_64_sysroot.tar.xz
3939

4040
- name: Test sysroot
4141
run: bazel build --config=x86_64_sysroot //sysroot/...
@@ -45,7 +45,7 @@ jobs:
4545
uses: svenstaro/upload-release-action@v1-release
4646
with:
4747
repo_token: ${{ secrets.GITHUB_TOKEN }}
48-
file: "sysroot/out/sysroot-build/bullseye/debian_bullseye_amd64_sysroot.tar.xz"
48+
file: "sysroot/out/sysroot-build/bookworm/debian_bookworm_amd64_sysroot.tar.xz"
4949
tag: ${{ github.ref }}
50-
asset_name: debian_bullseye_x86_64_sysroot.tar.xz
50+
asset_name: debian_bookworm_x86_64_sysroot.tar.xz
5151
overwrite: true

‎WORKSPACE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ filegroup(
3939
visibility = ["//visibility:public"],
4040
)
4141
""",
42-
src = "//:debian_bullseye_aarch64_sysroot.tar.xz",
42+
src = "//:debian_bookworm_aarch64_sysroot.tar.xz",
4343
)
4444

4545
local_archive(
@@ -51,5 +51,5 @@ filegroup(
5151
visibility = ["//visibility:public"],
5252
)
5353
""",
54-
src = "//:debian_bullseye_x86_64_sysroot.tar.xz",
54+
src = "//:debian_bookworm_x86_64_sysroot.tar.xz",
5555
)

‎sysroot/generated_package_lists/bookworm.amd64‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/gcc-10/libgcc-10-dev_10.2.1-6_amd64.deb
2+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/gcc-10/libgcc-s1_10.2.1-6_amd64.deb
3+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/gcc-10/libstdc++-10-dev_10.2.1-6_amd64.deb
4+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/gcc-10/libstdc++6_10.2.1-6_amd64.deb
5+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u5_amd64.deb
6+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/glibc/libc6_2.31-13+deb11u5_amd64.deb
7+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/lapack/libblas-dev_3.9.0-3+deb11u1_amd64.deb
8+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/lapack/libblas3_3.9.0-3+deb11u1_amd64.deb
9+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/lapack/liblapack-dev_3.9.0-3+deb11u1_amd64.deb
10+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/lapack/liblapack3_3.9.0-3+deb11u1_amd64.deb
11+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/linux/linux-libc-dev_5.10.218-1_amd64.deb
12+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u2_amd64.deb

‎sysroot/generated_package_lists/bookworm.arm64‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/gcc-10/libgcc-10-dev_10.2.1-6_arm64.deb
2+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/gcc-10/libgcc-s1_10.2.1-6_arm64.deb
3+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/gcc-10/libstdc++-10-dev_10.2.1-6_arm64.deb
4+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/gcc-10/libstdc++6_10.2.1-6_arm64.deb
5+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/glibc/libc6-dev_2.31-13+deb11u5_arm64.deb
6+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/g/glibc/libc6_2.31-13+deb11u5_arm64.deb
7+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/lapack/libblas-dev_3.9.0-3+deb11u1_arm64.deb
8+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/lapack/libblas3_3.9.0-3+deb11u1_arm64.deb
9+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/lapack/liblapack-dev_3.9.0-3+deb11u1_arm64.deb
10+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/lapack/liblapack3_3.9.0-3+deb11u1_arm64.deb
11+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/l/linux/linux-libc-dev_5.10.218-1_arm64.deb
12+
https://snapshot.debian.org/archive/debian/20240829T000000Z/pool/main/u/util-linux/uuid-dev_2.36.1-8+deb11u2_arm64.deb

‎sysroot/keyring.gpg‎

5.97 KB
Binary file not shown.

‎sysroot/sysroot-creator.sh‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,26 @@ set -o errexit
2121
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2222

2323
DISTRO=debian
24-
RELEASE=bullseye
24+
RELEASE=bookworm
2525

2626
# This number is appended to the sysroot key to cause full rebuilds. It
2727
# should be incremented when removing packages or patching existing packages.
2828
# It should not be incremented when adding packages.
2929
SYSROOT_RELEASE=1
3030

31-
ARCHIVE_TIMESTAMP=20230329T085712Z
31+
ARCHIVE_TIMESTAMP=20240829T000000Z
3232

3333
ARCHIVE_URL="https://snapshot.debian.org/archive/debian/$ARCHIVE_TIMESTAMP/"
3434
APT_SOURCES_LIST=(
35-
# Debian 12 (Bookworm) is needed for GTK4. It should be kept before bullseye
36-
# so that bullseye takes precedence.
37-
"${ARCHIVE_URL} bookworm main"
38-
"${ARCHIVE_URL} bookworm-updates main"
35+
# This mimics a sources.list from bookworm.
36+
"${ARCHIVE_URL} bookworm main contrib non-free non-free-firmware"
37+
"${ARCHIVE_URL} bookworm-updates main contrib non-free non-free-firmware"
38+
"${ARCHIVE_URL} bookworm-backports main contrib non-free non-free-firmware"
3939

40-
# Debian 9 (Stretch) is needed for gnome-keyring. It should be kept before
41-
# bullseye so that bullseye takes precedence.
42-
"${ARCHIVE_URL} stretch main"
43-
"${ARCHIVE_URL} stretch-updates main"
44-
45-
# This mimics a sources.list from bullseye.
40+
# Debian 11 (Bullseye) is kept for compatibility with older packages if needed.
41+
# It should be kept after bookworm so that bookworm takes precedence.
4642
"${ARCHIVE_URL} bullseye main contrib non-free"
4743
"${ARCHIVE_URL} bullseye-updates main contrib non-free"
48-
"${ARCHIVE_URL} bullseye-backports main contrib non-free"
4944
)
5045

5146
# gpg keyring file generated using generate_keyring.sh

0 commit comments

Comments
 (0)