From 2ef5dcae719c3103eb51f66479f8f76e7de4f135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 15 Jun 2023 09:26:41 -0400
Subject: [PATCH] packaging: deprecate fedora 36 (eol) - add debian 12
Change-Id: Ibc7d68a651b5f0ba488d6f45e910ddbe339568a2
---
extras/packaging/gnu-linux/Makefile | 1 +
.../gnu-linux/docker/Dockerfile_debian_12 | 22 ++++
.../gnu-linux/docker/Dockerfile_fedora_36 | 104 ------------------
.../gnu-linux/rules/debian/jami-all.postinst | 2 +
4 files changed, 25 insertions(+), 104 deletions(-)
create mode 100644 extras/packaging/gnu-linux/docker/Dockerfile_debian_12
delete mode 100644 extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
diff --git a/extras/packaging/gnu-linux/Makefile b/extras/packaging/gnu-linux/Makefile
index 5ed9b6441..e3d1e866b 100644
--- a/extras/packaging/gnu-linux/Makefile
+++ b/extras/packaging/gnu-linux/Makefile
@@ -161,6 +161,7 @@ endif
#
DISTRIBUTIONS := \
debian_11 \
+ debian_12 \
debian_testing \
debian_unstable \
ubuntu_20.04 \
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_debian_12 b/extras/packaging/gnu-linux/docker/Dockerfile_debian_12
new file mode 100644
index 000000000..edb435e4f
--- /dev/null
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_debian_12
@@ -0,0 +1,22 @@
+FROM debian:bookworm
+
+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
+
+ADD extras/packaging/gnu-linux/scripts/build-package-debian.sh /opt/build-package-debian.sh
+CMD ["/opt/build-package-debian.sh"]
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
deleted file mode 100644
index ac85af199..000000000
--- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
+++ /dev/null
@@ -1,104 +0,0 @@
-FROM fedora:36
-
-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 \
- libXext-devel \
- libXfixes-devel \
- yasm \
- python2.7 \
- python3-html5lib \
- 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 \
- clutter-devel \
- clutter-gtk-devel \
- libappindicator-gtk3-devel \
- libnotify-devel \
- libupnp-devel \
- qrencode-devel \
- libargon2-devel \
- libsndfile-devel \
- libdrm \
- 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 \
- vulkan-devel \
- libXrender-devel \
- xcb-util-* \
- xz \
- xkeyboard-config \
- libnotify \
- wget \
- libstdc++-static \
- sqlite-devel \
- perl-generators \
- perl-English \
- libxshmfence-devel \
- ninja-build \
- clang \
- cmake \
- fmt-devel \
- cups-devel #Chromium for Qt
-
-ADD extras/packaging/gnu-linux/scripts/build-package-rpm.sh /opt/build-package-rpm.sh
-
-CMD ["/opt/build-package-rpm.sh"]
diff --git a/extras/packaging/gnu-linux/rules/debian/jami-all.postinst b/extras/packaging/gnu-linux/rules/debian/jami-all.postinst
index 726d99484..c9d4e0a1e 100755
--- a/extras/packaging/gnu-linux/rules/debian/jami-all.postinst
+++ b/extras/packaging/gnu-linux/rules/debian/jami-all.postinst
@@ -93,6 +93,8 @@ if [ -f /etc/os-release ]; then
# Set-up Jami repository end tag
if [ "${VERSION_CODENAME}" = "bullseye" ] || [ "${ID}_${VERSION_ID}" = "debian_11" ]; then
ENDTAG="debian_11"
+ elif [ "${VERSION_CODENAME}" = "bookworm" ] || [ "${ID}_${VERSION_ID}" = "debian_12" ]; then
+ ENDTAG="debian_12"
elif [ "${UBUNTU_CODENAME}" = "focal" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.04" ]; then
ENDTAG="ubuntu_20.04"
elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then
--
GitLab