Skip to content

Commit efa4dc6

Browse files
committed
init_build_environment: add trixie support
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
1 parent ca7daf2 commit efa4dc6

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
1.7K May 8 2024 convert_translation.sh
2121
3.0K May 8 2024 create_acl_for_luci.sh
2222
3.7K May 8 2024 create_ucitrack_for_luci.sh
23-
12K Jun 20 14:46 init_build_environment.sh
23+
12K Aug 29 16:35 init_build_environment.sh
2424
18K Jun 1 2023 LICENSE
25-
4.0K Feb 6 14:59 maintainer-tools
26-
4.7K Feb 6 15:05 maketag.sh
25+
4.0K Feb 6 2025 maintainer-tools
26+
4.7K Feb 6 2025 maketag.sh
2727
1.1K Jun 1 2023 modify-firmware.sh
2828
902 Jun 1 2023 xiaomi_ssh_calc_pwd.sh
2929

@@ -50,7 +50,7 @@
5050
4.6K Jun 1 2023 check-abi-versions.pl
5151
1.5K Jun 1 2023 count-contributions.sh
5252
3.4K Jun 1 2023 github-apply.sh
53-
7.8K Feb 6 14:59 github-merge-pr.sh
53+
7.8K Feb 6 2025 github-merge-pr.sh
5454
3.9K Nov 14 2024 makebranch.sh
5555
24K Jun 1 2023 make-changelog.pl
5656
5.9K Jun 1 2023 make-signatures.pl

init_build_environment.sh

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ function check_system() {
3333
case "$VERSION_CODENAME" in
3434
"bionic")
3535
GCC_VERSION="9"
36+
LLVM_VERSION="18"
3637
NODE_DISTRO="$VERSION_CODENAME"
3738
NODE_KEY="nodesource.gpg.key"
3839
NODE_VERSION="18"
@@ -44,32 +45,44 @@ function check_system() {
4445
DISTRO_PREFIX="debian-archive/"
4546
DISTRO_SECUTIRY_PATH="buster/updates"
4647
GCC_VERSION="8"
48+
LLVL_VERSION="18"
4749
UBUNTU_CODENAME="bionic"
4850
VERSION_PACKAGE="lib32gcc1 python2"
4951
;;
5052
"focal"|\
5153
"jammy")
5254
GCC_VERSION="9"
55+
LLVM_VERSION="18"
5356
UBUNTU_CODENAME="$VERSION_CODENAME"
5457
VERSION_PACKAGE="lib32gcc-s1 python2"
5558
;;
5659
"bullseye")
5760
BPO_FLAG="-t $VERSION_CODENAME-backports"
5861
GCC_VERSION="9"
62+
LLVM_VERSION="18"
5963
UBUNTU_CODENAME="focal"
6064
VERSION_PACKAGE="lib32gcc-s1 python2"
6165
;;
6266
"bookworm")
6367
BPO_FLAG="-t $VERSION_CODENAME-backports"
6468
GCC_VERSION="12"
69+
LLVM_VERSION="18"
6570
UBUNTU_CODENAME="jammy"
6671
VERSION_PACKAGE="lib32gcc-s1"
6772
;;
6873
"noble")
6974
GCC_VERSION="12"
75+
LLVM_VERSION="18"
7076
UBUNTU_CODENAME="$VERSION_CODENAME"
7177
VERSION_PACKAGE="lib32gcc-s1"
7278
;;
79+
"trixie")
80+
BPO_FLAG="-t $VERSION_CODENAME-backports"
81+
GCC_VERSION="13"
82+
LLVM_VERSION="20"
83+
UBUNTU_CODENAME="noble"
84+
VERSION_PACKAGE="lib32gcc-s1"
85+
;;
7386
*)
7487
__error_msg "Unsupported OS, use Ubuntu 20.04 instead."
7588
exit 1
@@ -160,8 +173,8 @@ function update_apt_source() {
160173
curl -fsL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xe1dd270288b4e6030699e45fa1715d88e1df1f24" -o "/etc/apt/trusted.gpg.d/git-core-ubuntu-ppa.asc"
161174

162175
cat <<-EOF >"/etc/apt/sources.list.d/llvm-toolchain.list"
163-
deb https://apt.llvm.org/$VERSION_CODENAME/ llvm-toolchain-$VERSION_CODENAME-18 main
164-
deb-src https://apt.llvm.org/$VERSION_CODENAME/ llvm-toolchain-$VERSION_CODENAME-18 main
176+
deb https://apt.llvm.org/$VERSION_CODENAME/ llvm-toolchain-$VERSION_CODENAME-$LLVM_VERSION main
177+
deb-src https://apt.llvm.org/$VERSION_CODENAME/ llvm-toolchain-$VERSION_CODENAME-$LLVM_VERSION main
165178
EOF
166179
curl -fsL "https://apt.llvm.org/llvm-snapshot.gpg.key" -o "/etc/apt/trusted.gpg.d/llvm-toolchain.asc"
167180

@@ -224,9 +237,9 @@ function install_dependencies() {
224237
ln -svf "$i" "/usr/bin/${i%-18}"
225238
done
226239

227-
apt install -y $BPO_FLAG llvm-18
228-
for i in "/usr/bin"/llvm-*-18; do
229-
ln -svf "$i" "${i%-18}"
240+
apt install -y $BPO_FLAG "llvm-$LLVM_VERSION"
241+
for i in "/usr/bin"/llvm-*-"$LLVM_VERSION"; do
242+
ln -svf "$i" "${i%-$LLVM_VERSION}"
230243
done
231244

232245
apt install -y $BPO_FLAG nodejs yarn

0 commit comments

Comments
 (0)