Skip to content
Snippets Groups Projects
Commit ae1a2462 authored by François-Simon Fauteux-Chapleau's avatar François-Simon Fauteux-Chapleau Committed by Adrien Béraud
Browse files

packaging: add Ubuntu 25.04

Change-Id: I19a0d3e5de48a4e85822d5fcd00f83af0da16e1a
parent 31581db7
No related branches found
No related tags found
No related merge requests found
...@@ -167,6 +167,7 @@ DISTRIBUTIONS := \ ...@@ -167,6 +167,7 @@ DISTRIBUTIONS := \
ubuntu_22.04 \ ubuntu_22.04 \
ubuntu_24.04 \ ubuntu_24.04 \
ubuntu_24.10 \ ubuntu_24.10 \
ubuntu_25.04 \
fedora_37 \ fedora_37 \
fedora_38 \ fedora_38 \
fedora_39 \ fedora_39 \
......
FROM ubuntu:25.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean
RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \
devscripts \
equivs \
python-is-python3 \
wget
ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
COPY extras/packaging/gnu-linux/rules/debian-qt/control /tmp/builddeps/debian/control
RUN /opt/prebuild-package-debian.sh qt-deps
COPY extras/packaging/gnu-linux/rules/debian/control /tmp/builddeps/debian/control
RUN /opt/prebuild-package-debian.sh jami-deps
# Remove the libre2-dev package in order to force Qt to build using the bundled
# version of the RE2 library. This is necessary because the system version of the
# library on Ubuntu 25.04 (libre2-11) is not compatible with the one used in
# Qt 6.6.1 due to an API change:
# https://codereview.qt-project.org/c/qt/qtwebengine/+/516094
RUN apt-get remove -y libre2-dev libre2-11
ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
CMD ["/opt/build-package-debian.sh"]
...@@ -103,6 +103,8 @@ if [ -f /etc/os-release ]; then ...@@ -103,6 +103,8 @@ if [ -f /etc/os-release ]; then
ENDTAG="ubuntu_24.04" ENDTAG="ubuntu_24.04"
elif [ "${UBUNTU_CODENAME}" = "oracular" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_24.10" ]; then elif [ "${UBUNTU_CODENAME}" = "oracular" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_24.10" ]; then
ENDTAG="ubuntu_24.10" ENDTAG="ubuntu_24.10"
elif [ "${UBUNTU_CODENAME}" = "plucky" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_25.04" ]; then
ENDTAG="ubuntu_25.04"
elif [ "${ID}" = "debian" ] && \ elif [ "${ID}" = "debian" ] && \
[ "$(command -v lsb_release)" ] && \ [ "$(command -v lsb_release)" ] && \
[ "$(lsb_release -rs)" = "testing" ]; then [ "$(lsb_release -rs)" = "testing" ]; then
......
...@@ -47,7 +47,11 @@ if [ ! -f "${qt_deb_path}" ] || [ "${FORCE_REBUILD_QT}" = "true" ]; then ...@@ -47,7 +47,11 @@ if [ ! -f "${qt_deb_path}" ] || [ "${FORCE_REBUILD_QT}" = "true" ]; then
# HACK: For now on ubuntu 24.04 there is no python3.10 package # HACK: For now on ubuntu 24.04 there is no python3.10 package
# So create a PyEnv environment to install the required packages # So create a PyEnv environment to install the required packages
if cat /etc/os-release | grep -Eq "24.04"; then # NOTE: We use this on Ubuntu 25.04 too because otherwise we get
# a ModuleNotFoundError when building Qt 6.6.1 (specifically the
# chromium submodule in QtWebEngine) due to the version of python
# used (3.13) being too recent.
if cat /etc/os-release | grep -Eq "24.04|25.04"; then
apt-get install git gcc make python3-pip libssl-dev curl libreadline-dev -y apt-get install git gcc make python3-pip libssl-dev curl libreadline-dev -y
curl https://pyenv.run | bash curl https://pyenv.run | bash
export PYENV_ROOT="$HOME/.pyenv" export PYENV_ROOT="$HOME/.pyenv"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment