packaging: add fedora 29 package
+ Also update necessary contribs for fedora (sqlite-devel and
openssl-static)
Change-Id: Ib9e41a5cbd0dff6ef0208e7bb582e5e4e238e011
diff --git a/Makefile.packaging b/Makefile.packaging
index 8c7a5fa..baf00fa 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -87,12 +87,12 @@
package-ubuntu_18.04_i386 \
package-ubuntu_18.04_oci \
package-ubuntu_18.04_i386_oci \
- package-fedora_26 \
- package-fedora_26_i386 \
package-fedora_27 \
package-fedora_27_i386 \
package-fedora_28 \
package-fedora_28_i386 \
+ package-fedora_29 \
+ package-fedora_29_i386 \
package-gentoo
# Append the output of make-packaging-target to this Makefile
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
index e755822..dd58ecc 100644
--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -53,7 +53,9 @@
libvdpau-devel \
msgpack-devel \
NetworkManager-libnm-devel \
- openssl-devel
+ openssl-devel \
+ openssl-static \
+ sqlite-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_28 b/docker/Dockerfile_fedora_28
index 8218280..377e225 100644
--- a/docker/Dockerfile_fedora_28
+++ b/docker/Dockerfile_fedora_28
@@ -53,7 +53,9 @@
libvdpau-devel \
msgpack-devel \
NetworkManager-libnm-devel \
- openssl-devel
+ openssl-devel \
+ openssl-static \
+ sqlite-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_29
similarity index 93%
rename from docker/Dockerfile_fedora_26
rename to docker/Dockerfile_fedora_29
index f3b87a6f..b79dd2c 100644
--- a/docker/Dockerfile_fedora_26
+++ b/docker/Dockerfile_fedora_29
@@ -1,4 +1,4 @@
-FROM fedora:26
+FROM fedora:29
RUN dnf clean all
RUN dnf install -y dnf-command\(builddep\) rpmdevtools
@@ -53,7 +53,9 @@
libvdpau-devel \
msgpack-devel \
NetworkManager-libnm-devel \
- openssl-devel
+ openssl-devel \
+ openssl-static \
+ sqlite-devel
ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
diff --git a/make-ring.py b/make-ring.py
index 274b9ad..58ae60e 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -114,7 +114,8 @@
'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-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 = [
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 0e03615..6fc8bee 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -180,16 +180,6 @@
},
# Fedora
{
- "distribution": "fedora_26",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- },
- {
- "distribution": "fedora_26_i386",
- "debian_packaging_override": "",
- "output_file": ".packages-built",
- },
- {
"distribution": "fedora_27",
"debian_packaging_override": "",
"output_file": ".packages-built",
@@ -211,6 +201,18 @@
"output_file": ".packages-built",
"options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
},
+ {
+ "distribution": "fedora_29",
+ "debian_packaging_override": "",
+ "output_file": ".packages-built",
+ "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
+ },
+ {
+ "distribution": "fedora_29_i386",
+ "debian_packaging_override": "",
+ "output_file": ".packages-built",
+ "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
+ },
# Gentoo
{
"distribution": "gentoo",