From bde70f0789059550d977ad0ab229adf05eb81c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 6 Apr 2022 18:48:18 -0400
Subject: [PATCH] packaging: add ubuntu 22.04
Change-Id: I0e24dd8bbcc90e29cb63698507c46df439a2ca16
---
Makefile | 1 +
docker/Dockerfile_ubuntu_22.04 | 29 ++++++++++++++++++++++++
packaging/rules/debian/jami-all.postinst | 2 ++
3 files changed, 32 insertions(+)
create mode 100644 docker/Dockerfile_ubuntu_22.04
diff --git a/Makefile b/Makefile
index 59a76003..75c81928 100644
--- a/Makefile
+++ b/Makefile
@@ -165,6 +165,7 @@ DISTRIBUTIONS := \
ubuntu_20.04 \
ubuntu_21.04 \
ubuntu_21.10 \
+ ubuntu_22.04 \
fedora_33 \
fedora_34 \
fedora_35 \
diff --git a/docker/Dockerfile_ubuntu_22.04 b/docker/Dockerfile_ubuntu_22.04
new file mode 100644
index 00000000..957dd686
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_22.04
@@ -0,0 +1,29 @@
+FROM ubuntu:22.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 scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
+
+COPY packaging/rules/debian-qt/control /tmp/builddeps/debian/control
+RUN /opt/prebuild-package-debian.sh qt-deps
+
+COPY packaging/rules/debian/control /tmp/builddeps/debian/control
+RUN /opt/prebuild-package-debian.sh jami-deps
+
+# Install CMake 3.19 for Qt 6
+ADD scripts/install-cmake.sh /opt/install-cmake.sh
+RUN /opt/install-cmake.sh
+# nodejs
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN apt install nodejs -y
+
+ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
+CMD ["/opt/build-package-debian.sh"]
diff --git a/packaging/rules/debian/jami-all.postinst b/packaging/rules/debian/jami-all.postinst
index e2267b10..28a72969 100755
--- a/packaging/rules/debian/jami-all.postinst
+++ b/packaging/rules/debian/jami-all.postinst
@@ -105,6 +105,8 @@ if [ -f /etc/os-release ]; then
ENDTAG="ubuntu_21.04"
elif [ "${UBUNTU_CODENAME}" = "impish" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_21.10" ]; then
ENDTAG="ubuntu_21.10"
+ elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then
+ ENDTAG="ubuntu_22.04"
elif [ "${ID}" = "debian" ] && \
[ "$(command -v lsb_release)" ] && \
[ "$(lsb_release -rs)" = "testing" ]; then
--
GitLab