From a9db08948f055c90b13cb71d339e9a0d95c844ec Mon Sep 17 00:00:00 2001
From: Siham Moubarik <siham.moubarik@savoirfairelinux.com>
Date: Thu, 31 Oct 2019 15:13:12 -0400
Subject: [PATCH] Packaging: adds fedora 31
Change-Id: Ifabe4ca88973edb9cc58ce691ce659545f4edfc7
---
Makefile.packaging | 4 +-
docker/Dockerfile_fedora_31 | 65 ++++++++++++++++++++++++++++++++
scripts/make-packaging-target.py | 13 +++++++
3 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 docker/Dockerfile_fedora_31
diff --git a/Makefile.packaging b/Makefile.packaging
index 6185f159..e0085be6 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -111,7 +111,9 @@ package-all: package-debian_9 \
package-fedora_29_i386 \
package-fedora_30 \
package-fedora_30_i386 \
- package-gentoo
+ package-fedora_31 \
+ package-fedora_31_i386 \
+ package-gentoo
# Append the output of make-packaging-target to this Makefile
# see Makefile.packaging.distro_targets
diff --git a/docker/Dockerfile_fedora_31 b/docker/Dockerfile_fedora_31
new file mode 100644
index 00000000..b2ba1a97
--- /dev/null
+++ b/docker/Dockerfile_fedora_31
@@ -0,0 +1,65 @@
+FROM fedora:31
+
+RUN dnf clean all
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools
+
+RUN dnf clean all
+RUN dnf upgrade -y && \
+ dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
+ dnf install -y libinput-devel && \
+ dnf install -y \
+ git \
+ rpm-build \
+ tar \
+ make \
+ autoconf \
+ automake \
+ cmake \
+ speexdsp-devel \
+ pulseaudio-libs-devel \
+ libcanberra-devel \
+ libcurl-devel \
+ libtool \
+ dbus-devel \
+ expat-devel \
+ pcre-devel \
+ yaml-cpp-devel \
+ boost-devel \
+ dbus-c++-devel \
+ dbus-devel \
+ libXext-devel \
+ libXfixes-devel \
+ yasm \
+ nasm \
+ speex-devel \
+ gsm-devel \
+ chrpath \
+ check \
+ astyle \
+ uuid-c++-devel \
+ gettext-devel \
+ gcc-c++ \
+ which \
+ alsa-lib-devel \
+ systemd-devel \
+ libuuid-devel \
+ uuid-devel \
+ gnutls-devel \
+ nettle-devel \
+ opus-devel \
+ patch \
+ jsoncpp-devel \
+ libnatpmp-devel \
+ webkitgtk4-devel \
+ cryptopp-devel \
+ libva-devel \
+ libvdpau-devel \
+ msgpack-devel \
+ NetworkManager-libnm-devel \
+ openssl-devel \
+ openssl-static \
+ sqlite-devel
+
+ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
+
+CMD /opt/build-package-fedora.sh
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 75161e78..17cfdb96 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -338,6 +338,19 @@ def run_generate_all(parsed_args):
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
+ {
+ "distribution": "fedora_31",
+ "debian_packaging_override": "",
+ "output_file": ".packages-built",
+ "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
+ },
+ {
+ "distribution": "fedora_31_i386",
+ "debian_packaging_override": "",
+ "output_file": ".packages-built",
+ "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
+ },
+
# Gentoo
{
"distribution": "gentoo",
--
GitLab