From 8462564eed34a973dcc0bbd95147418ed422ced1 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Mon, 8 Feb 2021 10:47:37 -0500
Subject: [PATCH] maint: Remove packaging files for EOL distributions.
Debian 9 packaging is removed as well, not because it is EOL, but
because it doesn't have the runtime required to run Jami (the daemon
requires C++17 but GCC 6 in Debian stretch doesn't support it).
A 'list-package-targets' Make target is also added; it'll be used by
the CI.
Change-Id: I87a26b14ea48bd17ebccb536f23a5f2637f28743
---
Makefile | 55 ++------
docker/Dockerfile_debian_9 | 69 ----------
docker/Dockerfile_debian_9_arm64 | 72 -----------
docker/Dockerfile_debian_9_armhf | 72 -----------
docker/Dockerfile_debian_9_i386 | 69 ----------
docker/Dockerfile_fedora_27 | 63 ----------
docker/Dockerfile_fedora_28 | 63 ----------
docker/Dockerfile_fedora_29 | 69 ----------
docker/Dockerfile_fedora_30 | 65 ----------
docker/Dockerfile_fedora_31 | 65 ----------
docker/Dockerfile_opensuse-leap_15.1 | 88 -------------
docker/Dockerfile_ubuntu_19.10 | 69 ----------
docker/Dockerfile_ubuntu_19.10_i386 | 69 ----------
.../jami-all.postinst | 18 +--
packaging/rules/fedora/jami-all.postinst | 10 --
.../rules/opensuse-leap/jami-all.postinst | 22 +---
packaging/rules/rhel/jami-all.postinst | 2 -
scripts/make-packaging-target.py | 119 +-----------------
18 files changed, 16 insertions(+), 1043 deletions(-)
delete mode 100644 docker/Dockerfile_debian_9
delete mode 100644 docker/Dockerfile_debian_9_arm64
delete mode 100644 docker/Dockerfile_debian_9_armhf
delete mode 100644 docker/Dockerfile_debian_9_i386
delete mode 100644 docker/Dockerfile_fedora_27
delete mode 100644 docker/Dockerfile_fedora_28
delete mode 100644 docker/Dockerfile_fedora_29
delete mode 100644 docker/Dockerfile_fedora_30
delete mode 100644 docker/Dockerfile_fedora_31
delete mode 100644 docker/Dockerfile_opensuse-leap_15.1
delete mode 100644 docker/Dockerfile_ubuntu_19.10
delete mode 100644 docker/Dockerfile_ubuntu_19.10_i386
diff --git a/Makefile b/Makefile
index 5544c576..fed2e066 100644
--- a/Makefile
+++ b/Makefile
@@ -75,59 +75,18 @@ $(RELEASE_TARBALL_FILENAME):
## Packaging targets ##
#######################
-.PHONY: package-all
-package-all: package-debian_9 \
- package-debian_9_i386 \
- package-debian_9_armhf \
- package-debian_9_arm64 \
- package-debian_9_oci \
- package-debian_9_i386_oci \
- package-debian_9_armhf_oci \
- package-debian_9_arm64_oci \
- package-debian_10 \
- package-debian_10_i386 \
- package-debian_10_armhf \
- package-debian_10_arm64 \
- package-debian_10_oci \
- package-debian_10_i386_oci \
- package-debian_10_armhf_oci \
- package-debian_10_arm64_oci \
- package-raspbian_10_armhf \
- package-ubuntu_18.04 \
- package-ubuntu_18.04_i386 \
- package-ubuntu_18.04_oci \
- package-ubuntu_18.04_i386_oci \
- package-ubuntu_18.10 \
- package-ubuntu_18.10_i386 \
- package-ubuntu_18.10_oci \
- package-ubuntu_18.10_i386_oci \
- package-ubuntu_19.10 \
- 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-ubuntu_20.10 \
- package-ubuntu_20.10_oci \
- package-fedora_31 \
- package-fedora_31_i386 \
- package-fedora_32 \
- package-fedora_32_i386 \
- package-fedora_33 \
- package-fedora_33_i386 \
- package-rhel_8 \
- package-opensuse-leap_15.1 \
- package-opensuse-leap_15.2 \
- package-opensuse-tumbleweed \
- package-gentoo \
- package-snap
-
-
# Append the output of make-packaging-target to this Makefile
# see Makefile.packaging.distro_targets
$(shell scripts/make-packaging-target.py --generate-all > Makefile.packaging.distro_targets)
include Makefile.packaging.distro_targets
+package-all: $(PACKAGE-TARGETS)
+
+.PHONY: list-package-targets
+list-package-targets:
+ $(foreach p,$(PACKAGE-TARGETS),\
+ echo $(p);)
+
docker/Dockerfile_snap: patches/docker-snap-build-scripts.patch
if patch -p1 -fR --dry-run < $< >/dev/null 2>&1; then \
echo "Patching $@... skipped (already patched)"; \
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
deleted file mode 100644
index a07d3e9d..00000000
--- a/docker/Dockerfile_debian_9
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM debian:9
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y vim devscripts
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retires=10 \
- git \
- autoconf \
- automake \
- autopoint \
- cmake \
- nasm \
- libtool \
- libdbus-1-dev \
- libdbus-c++-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 \
- 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 \
- libappindicator3-dev \
- libqrencode-dev \
- libnm-dev \
- libwebkit2gtk-4.0-dev \
- libcrypto++-dev \
- libva-dev \
- libvdpau-dev \
- libssl-dev \
- libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_9_arm64 b/docker/Dockerfile_debian_9_arm64
deleted file mode 100644
index db22a802..00000000
--- a/docker/Dockerfile_debian_9_arm64
+++ /dev/null
@@ -1,72 +0,0 @@
-FROM arm64v8/debian:9
-
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-aarch64-static /usr/bin/qemu-aarch64-static
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y vim devscripts
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retires=10 \
- git \
- autoconf \
- automake \
- autopoint \
- cmake \
- libtool \
- libdbus-1-dev \
- libdbus-c++-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 \
- libappindicator3-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/docker/Dockerfile_debian_9_armhf b/docker/Dockerfile_debian_9_armhf
deleted file mode 100644
index 2dbafcb1..00000000
--- a/docker/Dockerfile_debian_9_armhf
+++ /dev/null
@@ -1,72 +0,0 @@
-FROM arm32v7/debian:9
-
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-arm-static /usr/bin/qemu-arm-static
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y vim devscripts
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retires=10 \
- git \
- autoconf \
- automake \
- autopoint \
- cmake \
- nasm \
- libtool \
- libdbus-1-dev \
- libdbus-c++-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 \
- 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 \
- libappindicator3-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/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
deleted file mode 100644
index a8930273..00000000
--- a/docker/Dockerfile_debian_9_i386
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM i386/debian:9
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y vim devscripts
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retires=10 \
- git \
- autoconf \
- automake \
- autopoint \
- cmake \
- nasm \
- libtool \
- libdbus-1-dev \
- libdbus-c++-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 \
- 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 \
- libappindicator3-dev \
- libqrencode-dev \
- libnm-dev \
- libwebkit2gtk-4.0-dev \
- libcrypto++-dev \
- libva-dev \
- libvdpau-dev \
- libssl-dev \
- libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
deleted file mode 100644
index cdb5f8ea..00000000
--- a/docker/Dockerfile_fedora_27
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM fedora:27
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
- dnf install -y \
- git \
- rpm-build \
- tar \
- nasm \
- make \
- autoconf \
- automake \
- cmake \
- speexdsp-devel \
- pulseaudio-libs-devel \
- libcanberra-devel \
- libtool \
- dbus-devel \
- expat-devel \
- pcre-devel \
- yaml-cpp-devel \
- boost-devel \
- dbus-c++-devel \
- dbus-devel \
- libXext-devel \
- libXfixes-devel \
- yasm \
- speex-devel \
- gsm-devel \
- chrpath \
- check \
- astyle \
- uuid-c++-devel \
- gettext-devel \
- gcc-c++ \
- which \
- alsa-lib-devel \
- systemd-devel \
- libuuid-devel \
- uuid-devel \
- gnutls-devel \
- nettle-devel \
- opus-devel \
- patch \
- jsoncpp-devel \
- libnatpmp-devel \
- webkitgtk4-devel \
- cryptopp-devel \
- libva-devel \
- libvdpau-devel \
- msgpack-devel \
- NetworkManager-libnm-devel \
- openssl-devel \
- openssl-static \
- sqlite-devel \
- libsndfile-devel
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_28 b/docker/Dockerfile_fedora_28
deleted file mode 100644
index cfaad5ca..00000000
--- a/docker/Dockerfile_fedora_28
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM fedora:28
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
- dnf install -y \
- git \
- rpm-build \
- tar \
- nasm \
- make \
- autoconf \
- automake \
- cmake \
- speexdsp-devel \
- pulseaudio-libs-devel \
- libcanberra-devel \
- libtool \
- dbus-devel \
- expat-devel \
- pcre-devel \
- yaml-cpp-devel \
- boost-devel \
- dbus-c++-devel \
- dbus-devel \
- libXext-devel \
- libXfixes-devel \
- yasm \
- speex-devel \
- gsm-devel \
- chrpath \
- check \
- astyle \
- uuid-c++-devel \
- gettext-devel \
- gcc-c++ \
- which \
- alsa-lib-devel \
- systemd-devel \
- libuuid-devel \
- uuid-devel \
- gnutls-devel \
- nettle-devel \
- opus-devel \
- patch \
- jsoncpp-devel \
- libnatpmp-devel \
- webkitgtk4-devel \
- cryptopp-devel \
- libva-devel \
- libvdpau-devel \
- msgpack-devel \
- NetworkManager-libnm-devel \
- openssl-devel \
- openssl-static \
- sqlite-devel \
- libsndfile-devel
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_29 b/docker/Dockerfile_fedora_29
deleted file mode 100644
index da6376fe..00000000
--- a/docker/Dockerfile_fedora_29
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM fedora:29
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
- dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
- dnf install -y libinput-devel && \
- dnf install -y qt5-qtbase-5.11.1-7.fc29 qt5-linguist-5.11.1-2.fc29 qt5-qtbase-devel-5.11.1-7.fc29 qt5-qttools-devel-5.11.1-2.fc29 && \
- dnf install -y \
- git \
- rpm-build \
- tar \
- nasm \
- make \
- autoconf \
- automake \
- cmake \
- speexdsp-devel \
- pulseaudio-libs-devel \
- libcanberra-devel \
- libcurl-devel \
- libtool \
- dbus-devel \
- expat-devel \
- pcre-devel \
- yaml-cpp-devel \
- boost-devel \
- dbus-c++-devel \
- dbus-devel \
- libXext-devel \
- libXfixes-devel \
- yasm \
- speex-devel \
- gsm-devel \
- chrpath \
- check \
- astyle \
- uuid-c++-devel \
- gettext-devel \
- gcc-c++ \
- which \
- alsa-lib-devel \
- systemd-devel \
- libuuid-devel \
- uuid-devel \
- gnutls-devel \
- nettle-devel \
- opus-devel \
- patch \
- jsoncpp-devel \
- libnatpmp-devel \
- webkitgtk4-devel \
- cryptopp-devel \
- libva-devel \
- libvdpau-devel \
- msgpack-devel \
- NetworkManager-libnm-devel \
- openssl-devel \
- openssl-static \
- sqlite-devel \
- libsndfile-devel
-
-RUN echo "exclude=qt5-qtbase* qt5-linguist* qt5-qttools-devel*" >> /etc/dnf/dnf.conf
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_30 b/docker/Dockerfile_fedora_30
deleted file mode 100644
index a80d8cdf..00000000
--- a/docker/Dockerfile_fedora_30
+++ /dev/null
@@ -1,65 +0,0 @@
-FROM fedora:30
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
- dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
- dnf install -y libinput-devel && \
- dnf install -y \
- git \
- rpm-build \
- tar \
- make \
- autoconf \
- automake \
- nasm \
- cmake \
- speexdsp-devel \
- pulseaudio-libs-devel \
- libcanberra-devel \
- libcurl-devel \
- libtool \
- dbus-devel \
- expat-devel \
- pcre-devel \
- yaml-cpp-devel \
- boost-devel \
- dbus-c++-devel \
- dbus-devel \
- libXext-devel \
- libXfixes-devel \
- yasm \
- speex-devel \
- gsm-devel \
- chrpath \
- check \
- astyle \
- uuid-c++-devel \
- gettext-devel \
- gcc-c++ \
- which \
- alsa-lib-devel \
- systemd-devel \
- libuuid-devel \
- uuid-devel \
- gnutls-devel \
- nettle-devel \
- opus-devel \
- patch \
- jsoncpp-devel \
- libnatpmp-devel \
- webkitgtk4-devel \
- cryptopp-devel \
- libva-devel \
- libvdpau-devel \
- msgpack-devel \
- NetworkManager-libnm-devel \
- openssl-devel \
- openssl-static \
- sqlite-devel
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_31 b/docker/Dockerfile_fedora_31
deleted file mode 100644
index ce62df9e..00000000
--- a/docker/Dockerfile_fedora_31
+++ /dev/null
@@ -1,65 +0,0 @@
-FROM fedora:31
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
- dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
- dnf install -y libinput-devel && \
- dnf install -y \
- git \
- rpm-build \
- tar \
- make \
- autoconf \
- automake \
- nasm \
- cmake \
- speexdsp-devel \
- pulseaudio-libs-devel \
- libcanberra-devel \
- libcurl-devel \
- libtool \
- dbus-devel \
- expat-devel \
- pcre-devel \
- yaml-cpp-devel \
- boost-devel \
- dbus-c++-devel \
- dbus-devel \
- libXext-devel \
- libXfixes-devel \
- yasm \
- speex-devel \
- gsm-devel \
- chrpath \
- check \
- astyle \
- uuid-c++-devel \
- gettext-devel \
- gcc-c++ \
- which \
- alsa-lib-devel \
- systemd-devel \
- libuuid-devel \
- uuid-devel \
- gnutls-devel \
- nettle-devel \
- opus-devel \
- patch \
- jsoncpp-devel \
- libnatpmp-devel \
- webkitgtk4-devel \
- cryptopp-devel \
- libva-devel \
- libvdpau-devel \
- msgpack-devel \
- NetworkManager-libnm-devel \
- openssl-devel \
- openssl-static \
- sqlite-devel
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_opensuse-leap_15.1 b/docker/Dockerfile_opensuse-leap_15.1
deleted file mode 100644
index 0bb7a964..00000000
--- a/docker/Dockerfile_opensuse-leap_15.1
+++ /dev/null
@@ -1,88 +0,0 @@
-FROM opensuse/leap:15.1
-RUN zypper --non-interactive install dnf
-RUN dnf clean all
-RUN zypper --non-interactive lr
-RUN zypper --non-interactive --gpg-auto-import-keys refresh
-RUN zypper --non-interactive lr
-RUN zypper --non-interactive install -y dnf-command\(builddep\) rpmdevtools
-
-RUN zypper --non-interactive clean
-RUN zypper --non-interactive up -y && \
- zypper --non-interactive install -y Mesa-dri-devel Mesa-dri && \
- zypper --non-interactive install -y libinput-devel && \
- zypper --non-interactive install -y \
- git \
- gcc8 \
- gcc8-c++ \
- rpm-build \
- tar \
- make \
- autoconf \
- automake \
- cmake \
- nasm \
- speexdsp-devel \
- libpulse-devel \
- libcanberra-devel \
- libcurl-devel \
- libtool \
- libQt5DBus-devel \
- pcre-devel \
- yaml-cpp-devel \
- boost-devel \
- libdbus-c++-devel \
- libQt5DBus-devel \
- libXext-devel \
- libXfixes-devel \
- yasm \
- speex-devel \
- libgsm-devel \
- chrpath \
- check \
- astyle \
- uuid-devel \
- gettext-devel \
- gcc-c++ \
- which \
- alsa-lib-devel \
- systemd-devel \
- libuuid-devel \
- uuid-devel \
- gnutls-devel \
- libopus-devel \
- patch \
- jsoncpp-devel \
- webkit2gtk3-devel \
- libcryptopp-devel \
- libva-devel \
- libvdpau-devel \
- msgpack-devel \
- clutter-devel \
- openssl-devel \
- clutter-gtk-devel \
- libnma-devel \
- libcryptopp-devel \
- libdbus-c++-devel \
- libQt5DBus-devel \
- libexpat-devel \
- gnome-icon-theme-symbolic \
- libgsm-devel \
- gtk3-devel \
- libappindicator-devel \
- sqlite-devel \
- libQt5Sql-devel \
- libQt5Gui-devel \
- ffmpeg-4-libavutil-devel \
- gtk3-devel\
- qrencode-devel \
- python3-python-dateutil \
- libqt5-linguist-devel \
- libsndfile-devel \
- evolution-devel
-
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
-
-ADD scripts/build-package-opensuse-leap.sh /opt/build-package-opensuse-leap.sh
-
-CMD /opt/build-package-opensuse-leap.sh
diff --git a/docker/Dockerfile_ubuntu_19.10 b/docker/Dockerfile_ubuntu_19.10
deleted file mode 100644
index fff233c5..00000000
--- a/docker/Dockerfile_ubuntu_19.10
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM ubuntu:19.10
-
-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/docker/Dockerfile_ubuntu_19.10_i386 b/docker/Dockerfile_ubuntu_19.10_i386
deleted file mode 100644
index e87532a6..00000000
--- a/docker/Dockerfile_ubuntu_19.10_i386
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM i386/ubuntu:19.10
-
-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 683710ba..3cfc28d0 100755
--- a/packaging/rules/debian-one-click-install/jami-all.postinst
+++ b/packaging/rules/debian-one-click-install/jami-all.postinst
@@ -23,7 +23,7 @@ set -e
# $JAMI_REPO = $JAMI_REPO_BASE/ubuntu_18.04/
#
# Debian 9:
-# $JAMI_REPO = $JAMI_REPO_BASE/debian_9
+# $JAMI_REPO = $JAMI_REPO_BASE/debian_10
#
# To update the appended end tags, modify the switch in [2].
# FIXME As soon as the repo get renamed to /nightly fix this url
@@ -95,22 +95,12 @@ if [ -f /etc/os-release ]; then
. /etc/os-release
# Set-up Jami repository end tag
- if [ "${DEBIAN_CODENAME}" = "stretch" ] || [ "${ID}_${VERSION_ID}" = "debian_9" ]; then
- ENDTAG="debian_9"
- elif [ "${DEBIAN_CODENAME}" = "buster" ] || [ "${ID}_${VERSION_ID}" = "debian_10" ]; then
+ if [ "${DEBIAN_CODENAME}" = "buster" ] || [ "${ID}_${VERSION_ID}" = "debian_10" ]; then
ENDTAG="debian_10"
- elif [ "${ID}_${VERSION_ID}" = "trisquel_8.0" ]; then
- ENDTAG="ubuntu_16.04"
- elif [ "${UBUNTU_CODENAME}" = "xenial" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_16.04" ]; then
- ENDTAG="ubuntu_16.04"
+ elif [ "${ID}_${VERSION_ID}" = "trisquel_9.0" ]; then
+ ENDTAG="ubuntu_18.04"
elif [ "${UBUNTU_CODENAME}" = "bionic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_18.04" ]; then
ENDTAG="ubuntu_18.04"
- elif [ "${UBUNTU_CODENAME}" = "cosmic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_18.10" ]; then
- ENDTAG="ubuntu_18.10"
- elif [ "${UBUNTU_CODENAME}" = "disco" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_19.04" ]; 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"
elif [ "${UBUNTU_CODENAME}" = "groovy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.10" ]; then
diff --git a/packaging/rules/fedora/jami-all.postinst b/packaging/rules/fedora/jami-all.postinst
index b6b9a0f8..f1c8c041 100755
--- a/packaging/rules/fedora/jami-all.postinst
+++ b/packaging/rules/fedora/jami-all.postinst
@@ -95,16 +95,6 @@ enabled=1'
# Set-up Jami repository end tag
if [ "${PLATFORM_ID}" = "platform:el8" ] || [ "${ID}_${VERSION_ID%.*}" = "rhel_8" ]; then
ENDTAG="rhel_8"
- elif [ "${PLATFORM_ID}" = "platform:f27" ] || [ "${ID}_${VERSION_ID}" = "fedora_27" ]; then
- ENDTAG="fedora_27"
- elif [ "${PLATFORM_ID}" = "platform:f28" ] || [ "${ID}_${VERSION_ID}" = "fedora_28" ]; then
- ENDTAG="fedora_28"
- elif [ "${PLATFORM_ID}" = "platform:f29" ] || [ "${ID}_${VERSION_ID}" = "fedora_29" ]; then
- ENDTAG="fedora_29"
- elif [ "${PLATFORM_ID}" = "platform:f30" ] || [ "${ID}_${VERSION_ID}" = "fedora_30" ]; then
- ENDTAG="fedora_30"
- elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
- ENDTAG="fedora_31"
elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
ENDTAG="fedora_32"
elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
diff --git a/packaging/rules/opensuse-leap/jami-all.postinst b/packaging/rules/opensuse-leap/jami-all.postinst
index 98a57cdc..6a425cf1 100755
--- a/packaging/rules/opensuse-leap/jami-all.postinst
+++ b/packaging/rules/opensuse-leap/jami-all.postinst
@@ -93,24 +93,8 @@ gpgkey=https://dl.jami.net/ring.pub.key
enabled=1'
# Set-up Jami repository end tag
- if [ "${PLATFORM_ID}" = "platform:el8" ] || [ "${ID}_${VERSION_ID%.*}" = "rhel_8" ]; then
- ENDTAG="rhel_8"
- elif [ "${PLATFORM_ID}" = "platform:f27" ] || [ "${ID}_${VERSION_ID}" = "fedora_27" ]; then
- ENDTAG="fedora_27"
- elif [ "${PLATFORM_ID}" = "platform:f28" ] || [ "${ID}_${VERSION_ID}" = "fedora_28" ]; then
- ENDTAG="fedora_28"
- elif [ "${PLATFORM_ID}" = "platform:f29" ] || [ "${ID}_${VERSION_ID}" = "fedora_29" ]; then
- ENDTAG="fedora_29"
- elif [ "${PLATFORM_ID}" = "platform:f30" ] || [ "${ID}_${VERSION_ID}" = "fedora_30" ]; then
- ENDTAG="fedora_30"
- elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
- ENDTAG="fedora_31"
- elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
- ENDTAG="fedora_32"
- elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
- ENDTAG="fedora_33"
- elif [ "${PLATFORM_ID}" = "opensuse-leap:15.1" ] || [ "${ID}_${VERSION_ID}" = "opensuse-leap_15.1" ]; then
- ENDTAG="opensuse-leap_15.1"
+ if [ "${PLATFORM_ID}" = "opensuse-leap:15.2" ]; then
+ ENDTAG="opensuse-leap_15.2"
REPO_FILE="/etc/zypp/repos.d/jami-main.repo"
GPG_FILE="/tmp/RPM-GPG-KEY-JAMI"
else
@@ -139,7 +123,7 @@ $JAMI_KEY
EOF
/usr/bin/rm -f /var/lib/rpm/.rpm.lock > /dev/null 2>&1
/usr/bin/rpm --import $GPG_FILE > /dev/null 2>&1
- if [ "${ENDTAG}" = "opensuse-leap_15.1" ]; then
+ if [ "${ENDTAG}" = "opensuse-leap_15.2" ]; then
rm -f $GPG_FILE
fi
# Add an entry for the package repository to the trusted package
diff --git a/packaging/rules/rhel/jami-all.postinst b/packaging/rules/rhel/jami-all.postinst
index ef68d27e..08f720a8 100755
--- a/packaging/rules/rhel/jami-all.postinst
+++ b/packaging/rules/rhel/jami-all.postinst
@@ -95,8 +95,6 @@ enabled=1'
# Set-up Jami repository end tag
if [ "${PLATFORM_ID}" = "platform:el8" ] || [ "${ID}_${VERSION_ID%.*}" = "rhel_8" ]; then
ENDTAG="rhel_8"
- elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
- ENDTAG="fedora_31"
elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
ENDTAG="fedora_32"
elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 67ce44c6..29ccf395 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -75,6 +75,7 @@ packages/%(distribution)s/%(output_file)s: $(RELEASE_TARBALL_FILENAME) packages/
.PHONY: package-%(distribution)s
package-%(distribution)s: packages/%(distribution)s/%(output_file)s
+PACKAGE-TARGETS += package-%(distribution)s
.PHONY: package-%(distribution)s-interactive
package-%(distribution)s-interactive: DOCKER_EXTRA_ARGS = -i
@@ -115,64 +116,6 @@ def run_generate(parsed_args):
def run_generate_all(parsed_args):
targets = [
# Debian
- {
- "distribution": "debian_9",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- },
- {
- "distribution": "debian_9_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- },
- {
- "distribution": "debian_9_armhf",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- "qemu_static": 'qemu-arm-static',
- },
- {
- "distribution": "debian_9_arm64",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- "qemu_static": 'qemu-aarch64-static',
- },
- {
- "distribution": "debian_9_oci",
- "docker_image": "debian_9",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
- "version": "$(DEBIAN_OCI_VERSION)",
- },
- {
- "distribution": "debian_9_i386_oci",
- "docker_image": "debian_9_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
- "version": "$(DEBIAN_OCI_VERSION)",
- },
- {
- "distribution": "debian_9_armhf_oci",
- "docker_image": "debian_9_armhf",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
- "version": "$(DEBIAN_OCI_VERSION)",
- "qemu_static": 'qemu-arm-static',
- },
- {
- "distribution": "debian_9_arm64_oci",
- "docker_image": "debian_9_arm64",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
- "version": "$(DEBIAN_OCI_VERSION)",
- "qemu_static": 'qemu-aarch64-static',
- },
{
"distribution": "debian_10",
"debian_packaging_override": "",
@@ -275,34 +218,6 @@ def run_generate_all(parsed_args):
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
"version": "$(DEBIAN_OCI_VERSION)",
},
- {
- "distribution": "ubuntu_19.10",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_19.10_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_19.10_oci",
- "docker_image": "ubuntu_19.10",
- "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)",
- },
- {
- "distribution": "ubuntu_19.10_i386_oci",
- "docker_image": "ubuntu_19.10_i386",
- "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)",
- },
{
"distribution": "ubuntu_20.04",
"debian_packaging_override": "",
@@ -333,42 +248,18 @@ def run_generate_all(parsed_args):
},
# Fedora
- {
- "distribution": "fedora_31",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_31_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
{
"distribution": "fedora_32",
"debian_packaging_override": "",
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
- {
- "distribution": "fedora_32_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
{
"distribution": "fedora_33",
"debian_packaging_override": "",
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
- {
- "distribution": "fedora_33_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
{
"distribution": "rhel_8",
"debian_packaging_override": "",
@@ -376,13 +267,7 @@ def run_generate_all(parsed_args):
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
"password_rhel8": "--build-arg PASS=${PASS}"
},
- #opensuse_leap
- {
- "distribution": "opensuse-leap_15.1",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged"
- },
+ # OpenSUSE
{
"distribution": "opensuse-leap_15.2",
"debian_packaging_override": "",
--
GitLab