From 4695dae6c20fad4c036d543182824a85dcc8c767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= Date: Wed, 21 Nov 2018 10:09:06 -0500 Subject: [PATCH] packaging: add ubuntu 18.10 packages Change-Id: I8da650f1458234392907c33b3035fe01bf85d953 --- Makefile.packaging | 12 +++-- docker/Dockerfile_ubuntu_16.04 | 2 +- docker/Dockerfile_ubuntu_16.04_i386 | 2 +- docker/Dockerfile_ubuntu_18.04 | 2 +- docker/Dockerfile_ubuntu_18.04_i386 | 2 +- docker/Dockerfile_ubuntu_18.10 | 70 +++++++++++++++++++++++++++++ docker/Dockerfile_ubuntu_18.10_i386 | 70 +++++++++++++++++++++++++++++ scripts/make-packaging-target.py | 26 +++++++++++ 8 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 docker/Dockerfile_ubuntu_18.10 create mode 100644 docker/Dockerfile_ubuntu_18.10_i386 diff --git a/Makefile.packaging b/Makefile.packaging index baf00fa..adacc39 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -83,10 +83,14 @@ package-all: package-debian_9 \ 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 \ - package-ubuntu_18.04_i386_oci \ + package-ubuntu_18.04 \ + package-ubuntu_18.04_i386 \ + package-ubuntu_18.04_oci \ + package-ubuntu_18.04_i386_oci \ + package-ubuntu_18.10 \ + package-ubuntu_18.10_i386 \ + package-ubuntu_18.10_oci \ + package-ubuntu_18.10_i386_oci \ package-fedora_27 \ package-fedora_27_i386 \ package-fedora_28 \ diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04 index 5788647..eeab692 100644 --- a/docker/Dockerfile_ubuntu_16.04 +++ b/docker/Dockerfile_ubuntu_16.04 @@ -9,7 +9,7 @@ RUN apt-get update && \ # Speed up mk-build-deps RUN apt-get clean RUN apt-get update && \ - apt-get install -y -o Acquire::Retires=10 \ + apt-get install -y -o Acquire::Retries=10 \ git \ autoconf \ automake \ diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386 index 96728b4..3684e22 100644 --- a/docker/Dockerfile_ubuntu_16.04_i386 +++ b/docker/Dockerfile_ubuntu_16.04_i386 @@ -9,7 +9,7 @@ RUN apt-get update && \ # Speed up mk-build-deps RUN apt-get clean RUN apt-get update && \ - apt-get install -y -o Acquire::Retires=10 \ + apt-get install -y -o Acquire::Retries=10 \ git \ autoconf \ automake \ diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04 index 5e20916..22e1628 100644 --- a/docker/Dockerfile_ubuntu_18.04 +++ b/docker/Dockerfile_ubuntu_18.04 @@ -9,7 +9,7 @@ RUN apt-get update && \ # Speed up mk-build-deps RUN apt-get clean RUN apt-get update && \ - apt-get install -y -o Acquire::Retires=10 \ + apt-get install -y -o Acquire::Retries=10 \ git \ autoconf \ automake \ diff --git a/docker/Dockerfile_ubuntu_18.04_i386 b/docker/Dockerfile_ubuntu_18.04_i386 index 5181337..6431c82 100644 --- a/docker/Dockerfile_ubuntu_18.04_i386 +++ b/docker/Dockerfile_ubuntu_18.04_i386 @@ -9,7 +9,7 @@ RUN apt-get update && \ # Speed up mk-build-deps RUN apt-get clean RUN apt-get update && \ - apt-get install -y -o Acquire::Retires=10 \ + apt-get install -y -o Acquire::Retries=10 \ git \ autoconf \ automake \ diff --git a/docker/Dockerfile_ubuntu_18.10 b/docker/Dockerfile_ubuntu_18.10 new file mode 100644 index 0000000..bad1a1e --- /dev/null +++ b/docker/Dockerfile_ubuntu_18.10 @@ -0,0 +1,70 @@ +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 \ + libupnp-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 \ + 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_18.10_i386 b/docker/Dockerfile_ubuntu_18.10_i386 new file mode 100644 index 0000000..0e5c171 --- /dev/null +++ b/docker/Dockerfile_ubuntu_18.10_i386 @@ -0,0 +1,70 @@ +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 \ + libupnp-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 \ + 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 6fc8bee..23bf5f8 100755 --- a/scripts/make-packaging-target.py +++ b/scripts/make-packaging-target.py @@ -178,6 +178,32 @@ 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)", + }, + { + "distribution": "ubuntu_18.10_i386", + "debian_packaging_override": "", + "output_file": "$(DEBIAN_DSC_FILENAME)", + }, + { + "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)", + "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)", + "version": "$(DEBIAN_OCI_VERSION)", + }, # Fedora { "distribution": "fedora_27", -- 2.22.0