Add support for Ubuntu 24.04 LTS (Noble)

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka 2024-03-22 18:40:38 +08:00
parent 202de8dfe1
commit ee1dd5fafb
6 changed files with 14 additions and 23 deletions

View File

@ -1,7 +1,7 @@
#!/usr/bin/make
DISTRO=bullseye
GCC_VER=10
LLVM_VER=13
DISTRO=noble
GCC_VER=13
LLVM_VER=17
ARCH=amd64
.PHONY: Dockerfile
Dockerfile: Dockerfile.in

View File

@ -1,5 +1,5 @@
#!/usr/bin/make
DISTRO=ubuntu:mantic
DISTRO=ubuntu:noble
.PHONY: Dockerfile
Dockerfile: Dockerfile.win64.in
sed 's/DISTRO/$(DISTRO)/' $< > $@ || rm -f $@

16
build
View File

@ -9,8 +9,7 @@ usage() {
echo -e " * bookworm * arm64"
echo -e " * focal"
echo -e " * jammy"
echo -e " * lunar"
echo -e " * mantic"
echo -e " * noble"
}
if [[ -z ${1} ]]; then
@ -28,12 +27,12 @@ case ${cli_release} in
'bullseye')
release="debian:bullseye"
gcc_version="10"
llvm_version="13"
llvm_version="16"
;;
'bookworm')
release="debian:bookworm"
gcc_version="12"
llvm_version="15"
llvm_version="16"
;;
'focal')
release="ubuntu:focal"
@ -45,13 +44,8 @@ case ${cli_release} in
gcc_version="11"
llvm_version="15"
;;
'lunar')
release="ubuntu:lunar"
gcc_version="12"
llvm_version="15"
;;
'mantic')
release="ubuntu:mantic"
'noble')
release="ubuntu:noble"
gcc_version="13"
llvm_version="17"
;;

View File

@ -9,7 +9,7 @@ for dep in docker make; do
done
# Use the latest distro for toolchains
distro="ubuntu:mantic"
distro="ubuntu:noble"
image_name="jellyfin-ffmpeg-build-windows-win64"
package_temporary_dir="$( mktemp -d )"
current_user="$( whoami )"

View File

@ -18,9 +18,6 @@ packages:
- jammy-amd64
- jammy-armhf
- jammy-arm64
- lunar-amd64
- lunar-armhf
- lunar-arm64
- mantic-amd64
- mantic-armhf
- mantic-arm64
- noble-amd64
- noble-armhf
- noble-arm64

View File

@ -1,4 +1,4 @@
FROM ubuntu:mantic
FROM ubuntu:noble
ENV DEBIAN_FRONTEND noninteractive
RUN \