This patch provides essential fixes for OVS to build and package on RHEL8.0.
The required package python3-sphinx can be installed by:
$ ARCH=$( /bin/arch )
$ subscription-manager repos --enable
"codeready-builder-for-rhel-8-${ARCH}-rpms"
$ yum install python3-sphinx
Signed-off-by: Yifeng Sun <[email protected]>
---
rhel/openvswitch-fedora.spec.in | 10 ++++++++--
rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 5 +++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 7bc8c34b80af..02504f05f9b7 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -60,9 +60,15 @@ BuildRequires: autoconf automake libtool
BuildRequires: systemd-units openssl openssl-devel
BuildRequires: python3-devel
BuildRequires: desktop-file-utils
-BuildRequires: groff graphviz
-BuildRequires: checkpolicy, selinux-policy-devel
+%if 0%{?rhel} >= 8
+BuildRequires: groff-base
+BuildRequires: python3-sphinx
+%else
+BuildRequires: groff
BuildRequires: /usr/bin/sphinx-build-3
+%endif
+BuildRequires: graphviz
+BuildRequires: checkpolicy, selinux-policy-devel
# make check dependencies
BuildRequires: procps-ng
%if %{with libcapng}
diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
index a9b5cdd817da..43dcc73fd3c5 100644
--- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
+++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
@@ -75,6 +75,11 @@ IFS='.\|-' read mainline_major mainline_minor mainline_patch
major_rev \
# echo mainline_major=$mainline_major mainline_minor=$mainline_minor \
# mainline_patch=$mainline_patch major_rev=$major_rev minor_rev=$minor_rev
+if [ "$mainline_major" = "4" ]; then
+ # Skip this script on rhel8
+ exit 0
+fi
+
expected_rhel_base_minor="el7"
if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then
if [ "$major_rev" = "327" ]; then
--
2.7.4
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
