diff --git a/Makefile.packaging b/Makefile.packaging
index 26d06b9cd2055e8fcc9cb7d003ce4195cfb37754..17a3bf1217f25a1e64ed33d455d6272ab3ba95a1 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -92,10 +92,6 @@ package-all: package-debian_9 \
package-debian_10_armhf_oci \
package-debian_10_arm64_oci \
package-raspbian_10_armhf \
- package-ubuntu_16.04 \
- package-ubuntu_16.04_i386 \
- package-ubuntu_16.04_oci \
- package-ubuntu_16.04_i386_oci \
package-ubuntu_18.04 \
package-ubuntu_18.04_i386 \
package-ubuntu_18.04_oci \
@@ -104,24 +100,12 @@ package-all: package-debian_9 \
package-ubuntu_18.10_i386 \
package-ubuntu_18.10_oci \
package-ubuntu_18.10_i386_oci \
- package-ubuntu_19.04 \
- package-ubuntu_19.04_i386 \
- package-ubuntu_19.04_oci \
- package-ubuntu_19.04_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-fedora_27 \
- package-fedora_27_i386 \
- package-fedora_28 \
- package-fedora_28_i386 \
- package-fedora_29 \
- package-fedora_29_i386 \
- package-fedora_30 \
- package-fedora_30_i386 \
package-fedora_31 \
package-fedora_31_i386 \
package-fedora_32 \
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
deleted file mode 100644
index 85373d69c2f9318c544d74cda276a8a83f93ba9e..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_16.04
+++ /dev/null
@@ -1,68 +0,0 @@
-FROM ubuntu:16.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y vim 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 \
- 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 \
- 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_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
deleted file mode 100644
index fa25b6e626b7eefcd2c299af8ee002e5f39b42c1..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ /dev/null
@@ -1,68 +0,0 @@
-FROM i386/ubuntu:16.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
- apt-get install -y vim 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 \
- 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 \
- 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_ubuntu_18.10 b/docker/Dockerfile_ubuntu_18.10
deleted file mode 100644
index cfeb60af7721e6d806295066a2ca5b0a1601787c..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_18.10
+++ /dev/null
@@ -1,70 +0,0 @@
-FROM ubuntu:18.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 \
- libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_ubuntu_18.10_i386 b/docker/Dockerfile_ubuntu_18.10_i386
deleted file mode 100644
index dec0f6d0ad1458d89df5a66653475d020203d3aa..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_18.10_i386
+++ /dev/null
@@ -1,70 +0,0 @@
-FROM i386/ubuntu:18.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 \
- libsndfile1-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.04 b/docker/Dockerfile_ubuntu_19.04
deleted file mode 100644
index a67a2201924cd514f03cdb35b6e9bacfa88a21d7..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_19.04
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM ubuntu:19.04
-
-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.04_i386 b/docker/Dockerfile_ubuntu_19.04_i386
deleted file mode 100644
index 51489a537f8d382f3d08345b4c9ab63b1e2d2970..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_19.04_i386
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM i386/ubuntu:19.04
-
-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/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 32fa9c9230db299504270444ea571581aa18b696..7b5188958a2f666cebc55f1bbd643832cfba4f28 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -250,32 +250,6 @@ def run_generate_all(parsed_args):
"qemu_static": 'qemu-arm-static',
},
# Ubuntu
- {
- "distribution": "ubuntu_16.04",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- },
- {
- "distribution": "ubuntu_16.04_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- },
- {
- "distribution": "ubuntu_16.04_oci",
- "docker_image": "ubuntu_16.04",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
- "version": "$(DEBIAN_OCI_VERSION)",
- },
- {
- "distribution": "ubuntu_16.04_i386_oci",
- "docker_image": "ubuntu_16.04_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
- "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
- "version": "$(DEBIAN_OCI_VERSION)",
- },
{
"distribution": "ubuntu_18.04",
"debian_packaging_override": "",
@@ -302,62 +276,6 @@ def run_generate_all(parsed_args):
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
"version": "$(DEBIAN_OCI_VERSION)",
},
- {
- "distribution": "ubuntu_18.10",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_18.10_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_18.10_oci",
- "docker_image": "ubuntu_18.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_18.10_i386_oci",
- "docker_image": "ubuntu_18.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_19.04",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_19.04_i386",
- "debian_packaging_override": "",
- "output_file": "$(DEBIAN_DSC_FILENAME)",
- "options": "--privileged --security-opt apparmor=docker-default",
- },
- {
- "distribution": "ubuntu_19.04_oci",
- "docker_image": "ubuntu_19.04",
- "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.04_i386_oci",
- "docker_image": "ubuntu_19.04_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_19.10",
"debian_packaging_override": "",
@@ -402,52 +320,6 @@ def run_generate_all(parsed_args):
},
# Fedora
- {
- "distribution": "fedora_27",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- },
- {
- "distribution": "fedora_27_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- },
- {
- "distribution": "fedora_28",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_28_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_29",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_29_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_30",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
- {
- "distribution": "fedora_30_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
- },
{
"distribution": "fedora_31",
"debian_packaging_override": "",