From ef63bf85afeca25b85c8582ba7ae0754b4cb17b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Mon, 17 Oct 2022 10:08:44 -0400 Subject: [PATCH] packaging: add ubuntu 22.10 Change-Id: Icbea98bd8a47c941c159f1f48398109450b50ed7 --- Makefile | 1 + docker/Dockerfile_ubuntu_22.10 | 22 ++++++++++++++++++++++ packaging/rules/debian/jami-all.postinst | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 docker/Dockerfile_ubuntu_22.10 diff --git a/Makefile b/Makefile index 974063fa..a10addfa 100644 --- a/Makefile +++ b/Makefile @@ -167,6 +167,7 @@ DISTRIBUTIONS := \ ubuntu_18.04 \ ubuntu_20.04 \ ubuntu_22.04 \ + ubuntu_22.10 \ fedora_35 \ fedora_36 \ fedora_37 \ diff --git a/docker/Dockerfile_ubuntu_22.10 b/docker/Dockerfile_ubuntu_22.10 new file mode 100644 index 00000000..827aa3b0 --- /dev/null +++ b/docker/Dockerfile_ubuntu_22.10 @@ -0,0 +1,22 @@ +FROM ubuntu:22.10 + +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 + +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 5f562bf5..93e1ebec 100755 --- a/packaging/rules/debian/jami-all.postinst +++ b/packaging/rules/debian/jami-all.postinst @@ -103,6 +103,8 @@ if [ -f /etc/os-release ]; then ENDTAG="ubuntu_20.04" elif [ "${UBUNTU_CODENAME}" = "jammy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.04" ]; then ENDTAG="ubuntu_22.04" + elif [ "${UBUNTU_CODENAME}" = "kinetic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_22.10" ]; then + ENDTAG="ubuntu_22.10" elif [ "${ID}" = "debian" ] && \ [ "$(command -v lsb_release)" ] && \ [ "$(lsb_release -rs)" = "testing" ]; then -- GitLab