From 61cccc0e7dcc40fd0085e570d4168b9d4b97eb0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 8 Apr 2019 16:19:51 -0400
Subject: [PATCH] packaging: add debian 10
Change-Id: I31decc933d2ae103dc8eb6047f1c9c5ae4f67661
---
Makefile.packaging | 4 ++
docker/Dockerfile_debian_10 | 70 ++++++++++++++++++++++++++++++++
docker/Dockerfile_debian_10_i386 | 70 ++++++++++++++++++++++++++++++++
scripts/make-packaging-target.py | 28 +++++++++++++
4 files changed, 172 insertions(+)
create mode 100644 docker/Dockerfile_debian_10
create mode 100644 docker/Dockerfile_debian_10_i386
diff --git a/Makefile.packaging b/Makefile.packaging
index 4bfc034a..4afceb46 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -79,6 +79,10 @@ package-all: package-debian_9 \
package-debian_9_i386 \
package-debian_9_oci \
package-debian_9_i386_oci \
+ package-debian_10 \
+ package-debian_10_i386 \
+ package-debian_10_oci \
+ package-debian_10_i386_oci \
package-ubuntu_16.04 \
package-ubuntu_16.04_i386 \
package-ubuntu_16.04_oci \
diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10
new file mode 100644
index 00000000..dfc718bd
--- /dev/null
+++ b/docker/Dockerfile_debian_10
@@ -0,0 +1,70 @@
+FROM debian:buster
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+ apt-get install -y vim devscripts
+
+# Speed up mk-build-deps
+RUN apt-get clean
+RUN apt-get update && \
+ apt-get install -y -o Acquire::Retires=10 \
+ git \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-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 \
+ libappindicator3-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_debian_10_i386 b/docker/Dockerfile_debian_10_i386
new file mode 100644
index 00000000..898c109f
--- /dev/null
+++ b/docker/Dockerfile_debian_10_i386
@@ -0,0 +1,70 @@
+FROM i386/debian:buster
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+ apt-get install -y vim devscripts
+
+# Speed up mk-build-deps
+RUN apt-get clean
+RUN apt-get update && \
+ apt-get install -y -o Acquire::Retires=10 \
+ git \
+ autoconf \
+ automake \
+ autopoint \
+ cmake \
+ libtool \
+ libdbus-1-dev \
+ libdbus-c++-dev \
+ libupnp-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 \
+ libappindicator3-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 35a071cc..7aab1e24 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -125,6 +125,34 @@ def run_generate_all(parsed_args):
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
"version": "$(DEBIAN_OCI_VERSION)",
},
+ {
+ "distribution": "debian_10",
+ "debian_packaging_override": "",
+ "output_file": "$(DEBIAN_DSC_FILENAME)",
+ "options": "--privileged --security-opt apparmor=docker-default",
+ },
+ {
+ "distribution": "debian_10_i386",
+ "debian_packaging_override": "",
+ "output_file": "$(DEBIAN_DSC_FILENAME)",
+ "options": "--privileged --security-opt apparmor=docker-default",
+ },
+ {
+ "distribution": "debian_10_oci",
+ "docker_image": "debian_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": "debian_10_i386_oci",
+ "docker_image": "debian_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)",
+ },
# Ubuntu
{
"distribution": "ubuntu_16.04",
--
GitLab