From 9f82770978d6ee5e94585f144a85ea7a838a0afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 14 Apr 2020 09:24:09 -0400
Subject: [PATCH] packaging: add ubuntu 20.04
Change-Id: Ic5619dec5e68a18519e7bf64d43a82150c91f73e
---
Makefile.packaging | 2 +
docker/Dockerfile_ubuntu_20.04 | 69 +++++++++++++++++++
.../jami-all.postinst | 2 +
scripts/make-packaging-target.py | 14 ++++
4 files changed, 87 insertions(+)
create mode 100644 docker/Dockerfile_ubuntu_20.04
diff --git a/Makefile.packaging b/Makefile.packaging
index e630722b..8c9e4d8f 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -112,6 +112,8 @@ package-all: package-debian_9 \
package-ubuntu_19.10_i386 \
package-ubuntu_19.10_oci \
package-ubuntu_19.10_i386_oci \
+ package-ubuntu_20.04 \
+ package-ubuntu_20.04_oci \
package-fedora_27 \
package-fedora_27_i386 \
package-fedora_28 \
diff --git a/docker/Dockerfile_ubuntu_20.04 b/docker/Dockerfile_ubuntu_20.04
new file mode 100644
index 00000000..30fa8c38
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_20.04
@@ -0,0 +1,69 @@
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+ apt-get install -y devscripts equivs
+
+# Speed up mk-build-deps
+RUN apt-get clean
+RUN apt-get update && \
+ apt-get install -y -o Acquire::Retries=10 \
+ git \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libgnutls28-dev \
+ libargon2-0-dev \
+ libcanberra-gtk3-dev \
+ libclutter-gtk-1.0-dev \
+ libclutter-1.0-dev \
+ libglib2.0-dev \
+ libgtk-3-dev \
+ libnotify-dev \
+ qtbase5-dev \
+ qttools5-dev \
+ qttools5-dev-tools \
+ yasm \
+ nasm \
+ autotools-dev \
+ gettext \
+ libpulse-dev \
+ libasound2-dev \
+ libexpat1-dev \
+ libpcre3-dev \
+ libyaml-cpp-dev \
+ libboost-dev \
+ libxext-dev \
+ libxfixes-dev \
+ libspeex-dev \
+ libspeexdsp-dev \
+ uuid-dev \
+ libavcodec-dev \
+ libavutil-dev \
+ libavformat-dev \
+ libswscale-dev \
+ libavdevice-dev \
+ libopus-dev \
+ libudev-dev \
+ libgsm1-dev \
+ libjsoncpp-dev \
+ libmsgpack-dev \
+ libnatpmp-dev \
+ libayatana-appindicator3-dev \
+ libqrencode-dev \
+ libnm-dev \
+ libwebkit2gtk-4.0-dev \
+ libcrypto++-dev \
+ libva-dev \
+ libvdpau-dev \
+ libssl-dev
+
+ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
+
+CMD /opt/build-package-debian.sh
diff --git a/packaging/rules/debian-one-click-install/jami-all.postinst b/packaging/rules/debian-one-click-install/jami-all.postinst
index 744c3690..8a60ae8a 100755
--- a/packaging/rules/debian-one-click-install/jami-all.postinst
+++ b/packaging/rules/debian-one-click-install/jami-all.postinst
@@ -111,6 +111,8 @@ if [ -f /etc/os-release ]; then
ENDTAG="ubuntu_19.04"
elif [ "${UBUNTU_CODENAME}" = "eoan" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_19.10" ]; then
ENDTAG="ubuntu_19.10"
+ elif [ "${UBUNTU_CODENAME}" = "focal" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.04" ]; then
+ ENDTAG="ubuntu_20.04"
else
# Distribution is not supported. Don't provide automatic updates.
CAN_ADD_DEB_SOURCE=false
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 8cb6964b..f1a6473e 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -383,6 +383,20 @@ def run_generate_all(parsed_args):
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)",
},
+ {
+ "distribution": "ubuntu_20.04",
+ "debian_packaging_override": "",
+ "output_file": "$(DEBIAN_DSC_FILENAME)",
+ "options": "--privileged --security-opt apparmor=docker-default",
+ },
+ {
+ "distribution": "ubuntu_20.04_oci",
+ "docker_image": "ubuntu_20.04",
+ "debian_packaging_override": "",
+ "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
+ "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
+ "version": "$(DEBIAN_OCI_VERSION)",
+ },
# Fedora
{
--
GitLab