diff --git a/Makefile.packaging b/Makefile.packaging index 4afceb46680fd18fcfa05063e54a992716016c52..6185f159895b07b24aa4c0e30a22cb084efccd1a 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -99,6 +99,10 @@ package-all: package-debian_9 \ 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-fedora_27 \ package-fedora_27_i386 \ package-fedora_28 \ diff --git a/docker/Dockerfile_ubuntu_19.10 b/docker/Dockerfile_ubuntu_19.10 new file mode 100644 index 0000000000000000000000000000000000000000..79f5839968690d2c530b2f1718eb10d29d20b9ab --- /dev/null +++ b/docker/Dockerfile_ubuntu_19.10 @@ -0,0 +1,70 @@ +FROM ubuntu:19.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 \ + libebook1.2-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.10_i386 b/docker/Dockerfile_ubuntu_19.10_i386 new file mode 100644 index 0000000000000000000000000000000000000000..95e1fe3a4c42c331b91cf6f7a2ee3b637728b60c --- /dev/null +++ b/docker/Dockerfile_ubuntu_19.10_i386 @@ -0,0 +1,70 @@ +FROM i386/ubuntu:19.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 \ + libebook1.2-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 7aab1e24f62b87a808c9004bdd05331d538e05a5..75161e7843bec2b65a7086eb62789cfb4a136950 100755 --- a/scripts/make-packaging-target.py +++ b/scripts/make-packaging-target.py @@ -262,6 +262,35 @@ def run_generate_all(parsed_args): "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": "", + "output_file": "$(DEBIAN_DSC_FILENAME)", + "options": "--privileged --security-opt apparmor=docker-default", + }, + { + "distribution": "ubuntu_19.10_i386", + "debian_packaging_override": "", + "output_file": "$(DEBIAN_DSC_FILENAME)", + "options": "--privileged --security-opt apparmor=docker-default", + }, + { + "distribution": "ubuntu_19.10_oci", + "docker_image": "ubuntu_19.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_19.10_i386_oci", + "docker_image": "ubuntu_19.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)", + }, + # Fedora { "distribution": "fedora_27",