From 6b53758fced2abe781aee049d064798397d2e8d7 Mon Sep 17 00:00:00 2001 From: Amin Bandali <amin.bandali@savoirfairelinux.com> Date: Fri, 20 Aug 2021 10:57:08 -0400 Subject: [PATCH] packaging: remove EOL ubuntu 20.10 Change-Id: I10a69b2026f6e6aa963ffaa95702c0c58c39d216 --- docker/Dockerfile_ubuntu_20.10 | 25 ------------------------ packaging/rules/debian/jami-all.postinst | 2 -- scripts/make-packaging-target.py | 5 ----- 3 files changed, 32 deletions(-) delete mode 100644 docker/Dockerfile_ubuntu_20.10 diff --git a/docker/Dockerfile_ubuntu_20.10 b/docker/Dockerfile_ubuntu_20.10 deleted file mode 100644 index 61f850e7..00000000 --- a/docker/Dockerfile_ubuntu_20.10 +++ /dev/null @@ -1,25 +0,0 @@ -FROM ubuntu:20.10 - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get clean -RUN apt-get update && \ - apt-get install -y -o Acquire::Retries=10 \ - devscripts \ - equivs \ - wget - -# add deb-src entries (needed for next step) -RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list -RUN apt-get clean && apt-get update - -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 3781271c..31ad8b6e 100755 --- a/packaging/rules/debian/jami-all.postinst +++ b/packaging/rules/debian/jami-all.postinst @@ -104,8 +104,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}" = "groovy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.10" ]; then - ENDTAG="ubuntu_20.10" elif [ "${UBUNTU_CODENAME}" = "hirsute" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_21.04" ]; then ENDTAG="ubuntu_21.04" elif [ "${ID}" = "debian" ] && \ diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py index 8fe87439..3f933ab9 100755 --- a/scripts/make-packaging-target.py +++ b/scripts/make-packaging-target.py @@ -170,11 +170,6 @@ def run_generate_all(parsed_args): "output_file": "$(DEBIAN_DSC_FILENAME)", "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS, }, - { - "distribution": "ubuntu_20.10", - "output_file": "$(DEBIAN_DSC_FILENAME)", - "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS, - }, { "distribution": "ubuntu_21.04", "output_file": "$(DEBIAN_DSC_FILENAME)", -- GitLab