Skip to content
Snippets Groups Projects
Unverified Commit f9bd2f50 authored by Sébastien Blin's avatar Sébastien Blin
Browse files

packaging: add fedora 29 package

+ Also update necessary contribs for fedora (sqlite-devel and
openssl-static)

Change-Id: Ib9e41a5cbd0dff6ef0208e7bb582e5e4e238e011
parent ceede5fb
Branches release/201811
No related merge requests found
...@@ -87,12 +87,12 @@ package-all: package-debian_9 \ ...@@ -87,12 +87,12 @@ package-all: package-debian_9 \
package-ubuntu_18.04_i386 \ package-ubuntu_18.04_i386 \
package-ubuntu_18.04_oci \ package-ubuntu_18.04_oci \
package-ubuntu_18.04_i386_oci \ package-ubuntu_18.04_i386_oci \
package-fedora_26 \
package-fedora_26_i386 \
package-fedora_27 \ package-fedora_27 \
package-fedora_27_i386 \ package-fedora_27_i386 \
package-fedora_28 \ package-fedora_28 \
package-fedora_28_i386 \ package-fedora_28_i386 \
package-fedora_29 \
package-fedora_29_i386 \
package-gentoo package-gentoo
# Append the output of make-packaging-target to this Makefile # Append the output of make-packaging-target to this Makefile
......
...@@ -53,7 +53,9 @@ RUN dnf upgrade -y && \ ...@@ -53,7 +53,9 @@ RUN dnf upgrade -y && \
libvdpau-devel \ libvdpau-devel \
msgpack-devel \ msgpack-devel \
NetworkManager-libnm-devel \ NetworkManager-libnm-devel \
openssl-devel openssl-devel \
openssl-static \
sqlite-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
...@@ -53,7 +53,9 @@ RUN dnf upgrade -y && \ ...@@ -53,7 +53,9 @@ RUN dnf upgrade -y && \
libvdpau-devel \ libvdpau-devel \
msgpack-devel \ msgpack-devel \
NetworkManager-libnm-devel \ NetworkManager-libnm-devel \
openssl-devel openssl-devel \
openssl-static \
sqlite-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
FROM fedora:26 FROM fedora:29
RUN dnf clean all RUN dnf clean all
RUN dnf install -y dnf-command\(builddep\) rpmdevtools RUN dnf install -y dnf-command\(builddep\) rpmdevtools
...@@ -53,7 +53,9 @@ RUN dnf upgrade -y && \ ...@@ -53,7 +53,9 @@ RUN dnf upgrade -y && \
libvdpau-devel \ libvdpau-devel \
msgpack-devel \ msgpack-devel \
NetworkManager-libnm-devel \ NetworkManager-libnm-devel \
openssl-devel openssl-devel \
openssl-static \
sqlite-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
......
...@@ -114,7 +114,8 @@ DNF_DEPENDENCIES = [ ...@@ -114,7 +114,8 @@ DNF_DEPENDENCIES = [
'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel', 'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel', 'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel',
'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel', 'openssl-devel', 'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel', 'openssl-devel',
'webkitgtk4-devel', 'NetworkManager-libnm-devel', 'libvdpau-devel', 'msgpack-devel', 'libcanberra-devel' 'webkitgtk4-devel', 'NetworkManager-libnm-devel', 'libvdpau-devel', 'msgpack-devel', 'libcanberra-devel',
'sqlite-devel', 'openssl-static'
] ]
APT_DEPENDENCIES = [ APT_DEPENDENCIES = [
......
...@@ -180,33 +180,35 @@ def run_generate_all(parsed_args): ...@@ -180,33 +180,35 @@ def run_generate_all(parsed_args):
}, },
# Fedora # Fedora
{ {
"distribution": "fedora_26", "distribution": "fedora_27",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
}, },
{ {
"distribution": "fedora_26_i386", "distribution": "fedora_27_i386",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
}, },
{ {
"distribution": "fedora_27", "distribution": "fedora_28",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
}, },
{ {
"distribution": "fedora_27_i386", "distribution": "fedora_28_i386",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
}, },
{ {
"distribution": "fedora_28", "distribution": "fedora_29",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged", "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
}, },
{ {
"distribution": "fedora_28_i386", "distribution": "fedora_29_i386",
"debian_packaging_override": "", "debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged", "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment