From 7f0e1e043ad10cfb37e97e722e71643612bc9ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 25 Jul 2022 10:15:07 -0400
Subject: [PATCH] packaging: remove EOL distributions (ubuntu 21.* & fedora <
35)
Change-Id: Ib251f8c4e0a48673e904298df2b260febc4fd235
---
Makefile | 4 -
docker/Dockerfile_fedora_33 | 104 -----------------------
docker/Dockerfile_fedora_34 | 103 ----------------------
docker/Dockerfile_ubuntu_21.04 | 32 -------
docker/Dockerfile_ubuntu_21.10 | 32 -------
packaging/rules/debian/jami-all.postinst | 4 -
6 files changed, 279 deletions(-)
delete mode 100644 docker/Dockerfile_fedora_33
delete mode 100644 docker/Dockerfile_fedora_34
delete mode 100644 docker/Dockerfile_ubuntu_21.04
delete mode 100644 docker/Dockerfile_ubuntu_21.10
diff --git a/Makefile b/Makefile
index 5ea0ecac..607a5b43 100644
--- a/Makefile
+++ b/Makefile
@@ -163,11 +163,7 @@ DISTRIBUTIONS := \
raspbian_10_armhf \
ubuntu_18.04 \
ubuntu_20.04 \
- ubuntu_21.04 \
- ubuntu_21.10 \
ubuntu_22.04 \
- fedora_33 \
- fedora_34 \
fedora_35 \
fedora_36 \
opensuse-leap_15.3 \
diff --git a/docker/Dockerfile_fedora_33 b/docker/Dockerfile_fedora_33
deleted file mode 100644
index 03a641bd..00000000
--- a/docker/Dockerfile_fedora_33
+++ /dev/null
@@ -1,104 +0,0 @@
-FROM fedora:33
-
-RUN dnf clean all
-
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
- dnf install -y mock
-
-RUN dnf groupinstall -y "X Software Development"
-
-RUN dnf install -y \
- git \
- rpm-build \
- tar \
- make \
- autoconf \
- automake \
- nasm \
- speexdsp-devel \
- pulseaudio-libs-devel \
- libcanberra-devel \
- libcurl-devel \
- libtool \
- mesa-libgbm-devel \
- mesa-dri-drivers \
- dbus-devel \
- expat-devel \
- pcre-devel \
- yaml-cpp-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 \
- python2.7 \
- jsoncpp-devel \
- libnatpmp-devel \
- webkitgtk4-devel \
- cryptopp-devel \
- libva-devel \
- libvdpau-devel \
- msgpack-devel \
- NetworkManager-libnm-devel \
- openssl-devel \
- openssl-static \
- clutter-devel \
- clutter-gtk-devel \
- libappindicator-gtk3-devel \
- libnotify-devel \
- libupnp-devel \
- qrencode-devel \
- libargon2-devel \
- libsndfile-devel \
- libdrm \
- gperf \
- clang \
- clang-devel \
- llvm-devel \
- nodejs \
- bison \
- flex \
- gstreamer1 gstreamer1-devel \
- gstreamer1-plugins-base-devel \
- gstreamer1-plugins-good \
- gstreamer1-plugins-bad-free-devel \
- nss-devel \
- libxcb* \
- libxkb* \
- libXrender-devel \
- xcb-util-* \
- libX11-devel \
- xz \
- xkeyboard-config \
- libnotify \
- wget \
- libstdc++-static \
- sqlite-devel \
- perl-generators \
- perl-English \
- libxshmfence-devel \
- ninja-build \
- vulkan-devel \
- python2-six \
- cmake
-
-ADD scripts/build-package-rpm.sh /opt/build-package-rpm.sh
-
-CMD ["/opt/build-package-rpm.sh"]
diff --git a/docker/Dockerfile_fedora_34 b/docker/Dockerfile_fedora_34
deleted file mode 100644
index 316834af..00000000
--- a/docker/Dockerfile_fedora_34
+++ /dev/null
@@ -1,103 +0,0 @@
-FROM fedora:34
-
-RUN dnf clean all
-
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
- dnf install -y mock
-
-RUN dnf groupinstall -y "X Software Development"
-
-RUN dnf install -y \
- git \
- rpm-build \
- tar \
- make \
- autoconf \
- automake \
- nasm \
- speexdsp-devel \
- pulseaudio-libs-devel \
- libcanberra-devel \
- libcurl-devel \
- libtool \
- mesa-libgbm-devel \
- mesa-dri-drivers \
- dbus-devel \
- expat-devel \
- pcre-devel \
- yaml-cpp-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 \
- clutter-devel \
- clutter-gtk-devel \
- libappindicator-gtk3-devel \
- libnotify-devel \
- libupnp-devel \
- qrencode-devel \
- libargon2-devel \
- libsndfile-devel \
- libdrm \
- python2.7 \
- gperf \
- bison \
- clang \
- clang-devel \
- llvm-devel \
- nodejs \
- flex \
- gstreamer1 gstreamer1-devel \
- gstreamer1-plugins-base-devel \
- gstreamer1-plugins-good \
- gstreamer1-plugins-bad-free-devel \
- nss-devel \
- libxcb* \
- libxkb* \
- libX11-devel \
- libXrender-devel \
- xcb-util-* \
- xz \
- xkeyboard-config \
- libnotify \
- wget \
- libstdc++-static \
- sqlite-devel \
- perl-generators \
- perl-English \
- libxshmfence-devel \
- vulkan-devel \
- ninja-build \
- cmake
-
-ADD scripts/build-package-rpm.sh /opt/build-package-rpm.sh
-
-CMD ["/opt/build-package-rpm.sh"]
diff --git a/docker/Dockerfile_ubuntu_21.04 b/docker/Dockerfile_ubuntu_21.04
deleted file mode 100644
index 0e8047cf..00000000
--- a/docker/Dockerfile_ubuntu_21.04
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM ubuntu:21.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- devscripts \
- equivs \
- nodejs \
- gcc-11 \
- g++-11 \
- 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
-
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 50
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 50
-
-# Install CMake 3.19 for Qt 6
-ADD scripts/install-cmake.sh /opt/install-cmake.sh
-RUN /opt/install-cmake.sh
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-CMD ["/opt/build-package-debian.sh"]
diff --git a/docker/Dockerfile_ubuntu_21.10 b/docker/Dockerfile_ubuntu_21.10
deleted file mode 100644
index 24805081..00000000
--- a/docker/Dockerfile_ubuntu_21.10
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM ubuntu:21.10
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y -o Acquire::Retries=10 \
- devscripts \
- equivs \
- nodejs \
- gcc-11 \
- g++-11 \
- 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
-
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 50
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 50
-
-# Install CMake 3.19 for Qt 6
-ADD scripts/install-cmake.sh /opt/install-cmake.sh
-RUN /opt/install-cmake.sh
-
-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 28a72969..5f562bf5 100755
--- a/packaging/rules/debian/jami-all.postinst
+++ b/packaging/rules/debian/jami-all.postinst
@@ -101,10 +101,6 @@ if [ -f /etc/os-release ]; then
ENDTAG="ubuntu_18.04"
elif [ "${UBUNTU_CODENAME}" = "focal" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.04" ]; then
ENDTAG="ubuntu_20.04"
- elif [ "${UBUNTU_CODENAME}" = "hirsute" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_21.04" ]; 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" ] && \
--
GitLab