[ovs-dev,ovn,4/4] cleanup rhel folder

From: Numan Siddique <nusiddiq@redhat.com>

The patch renames the make target - 'rpm-fedora-ovn' to 'rpm-fedora'

Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
---
 rhel/automake.mk                              |  59 +-
 rhel/etc_init.d_openvswitch                   | 102 ----
 rhel/etc_logrotate.d_openvswitch              |  22 -
 rhel/etc_openvswitch_default.conf             |   5 -
 rhel/etc_sysconfig_network-scripts_ifdown-ovs |  71 ---
 rhel/etc_sysconfig_network-scripts_ifup-ovs   | 226 --------
 rhel/kmod-openvswitch-rhel6.spec.in           | 122 ----
 rhel/openvswitch-dkms.spec.in                 | 100 ----
 rhel/openvswitch-fedora.spec.in               | 540 ------------------
 rhel/openvswitch-kmod-fedora.spec.in          | 134 -----
 rhel/openvswitch.spec.in                      | 282 ---------
 ...b_systemd_system_openvswitch-ipsec.service |  14 -
 ...usr_lib_systemd_system_openvswitch.service |  17 -
 ..._system_ovs-delete-transient-ports.service |  10 -
 ...lib_systemd_system_ovs-vswitchd.service.in |  32 --
 ...sr_lib_systemd_system_ovsdb-server.service |  26 -
 rhel/usr_lib_udev_rules.d_91-vfio.rules       |   1 -
 ...are_openvswitch_scripts_ovs-kmod-manage.sh | 160 ------
 ...are_openvswitch_scripts_ovs-systemd-reload |  49 --
 ...are_openvswitch_scripts_sysconfig.template |  24 -
 ...vswitch_scripts_systemd_sysconfig.template |  31 -
 21 files changed, 1 insertion(+), 2026 deletions(-)
 delete mode 100755 rhel/etc_init.d_openvswitch
 delete mode 100644 rhel/etc_logrotate.d_openvswitch
 delete mode 100644 rhel/etc_openvswitch_default.conf
 delete mode 100755 rhel/etc_sysconfig_network-scripts_ifdown-ovs
 delete mode 100755 rhel/etc_sysconfig_network-scripts_ifup-ovs
 delete mode 100644 rhel/kmod-openvswitch-rhel6.spec.in
 delete mode 100644 rhel/openvswitch-dkms.spec.in
 delete mode 100644 rhel/openvswitch-fedora.spec.in
 delete mode 100644 rhel/openvswitch-kmod-fedora.spec.in
 delete mode 100644 rhel/openvswitch.spec.in
 delete mode 100644 rhel/usr_lib_systemd_system_openvswitch-ipsec.service
 delete mode 100644 rhel/usr_lib_systemd_system_openvswitch.service
 delete mode 100644 rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service
 delete mode 100644 rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
 delete mode 100644 rhel/usr_lib_systemd_system_ovsdb-server.service
 delete mode 100644 rhel/usr_lib_udev_rules.d_91-vfio.rules
 delete mode 100644 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
 delete mode 100755 rhel/usr_share_openvswitch_scripts_ovs-systemd-reload
 delete mode 100644 rhel/usr_share_openvswitch_scripts_sysconfig.template
 delete mode 100644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template

On Wed, Jun 12, 2019 at 12:49:32PM +0530, nusiddiq@redhat.com wrote:
> From: Numan Siddique <nusiddiq@redhat.com>
> 
> The patch renames the make target - 'rpm-fedora-ovn' to 'rpm-fedora'
> 
> Signed-off-by: Numan Siddique <nusiddiq@redhat.com>

I didn't read all of this one, so the following Ack is merely that I
approve the concept described in the commit message.  You can decide
that you're comfortable with this or that you want another reviewer:
Acked-by: Ben Pfaff <blp@ovn.org>

>
> From: Numan Siddique <nusiddiq@redhat.com>
>
> The patch renames the make target - 'rpm-fedora-ovn' to 'rpm-fedora'
>
> Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
> ---

Tested-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>

>  rhel/automake.mk                              |  59 +-
>  rhel/etc_init.d_openvswitch                   | 102 ----
>  rhel/etc_logrotate.d_openvswitch              |  22 -
>  rhel/etc_openvswitch_default.conf             |   5 -
>  rhel/etc_sysconfig_network-scripts_ifdown-ovs |  71 ---
>  rhel/etc_sysconfig_network-scripts_ifup-ovs   | 226 --------
>  rhel/kmod-openvswitch-rhel6.spec.in           | 122 ----
>  rhel/openvswitch-dkms.spec.in                 | 100 ----
>  rhel/openvswitch-fedora.spec.in               | 540 ------------------
>  rhel/openvswitch-kmod-fedora.spec.in          | 134 -----
>  rhel/openvswitch.spec.in                      | 282 ---------
>  ...b_systemd_system_openvswitch-ipsec.service |  14 -
>  ...usr_lib_systemd_system_openvswitch.service |  17 -
>  ..._system_ovs-delete-transient-ports.service |  10 -
>  ...lib_systemd_system_ovs-vswitchd.service.in |  32 --
>  ...sr_lib_systemd_system_ovsdb-server.service |  26 -
>  rhel/usr_lib_udev_rules.d_91-vfio.rules       |   1 -
>  ...are_openvswitch_scripts_ovs-kmod-manage.sh | 160 ------
>  ...are_openvswitch_scripts_ovs-systemd-reload |  49 --
>  ...are_openvswitch_scripts_sysconfig.template |  24 -
>  ...vswitch_scripts_systemd_sysconfig.template |  31 -
>  21 files changed, 1 insertion(+), 2026 deletions(-)
>  delete mode 100755 rhel/etc_init.d_openvswitch
>  delete mode 100644 rhel/etc_logrotate.d_openvswitch
>  delete mode 100644 rhel/etc_openvswitch_default.conf
>  delete mode 100755 rhel/etc_sysconfig_network-scripts_ifdown-ovs
>  delete mode 100755 rhel/etc_sysconfig_network-scripts_ifup-ovs
>  delete mode 100644 rhel/kmod-openvswitch-rhel6.spec.in
>  delete mode 100644 rhel/openvswitch-dkms.spec.in
>  delete mode 100644 rhel/openvswitch-fedora.spec.in
>  delete mode 100644 rhel/openvswitch-kmod-fedora.spec.in
>  delete mode 100644 rhel/openvswitch.spec.in
>  delete mode 100644 rhel/usr_lib_systemd_system_openvswitch-ipsec.service
>  delete mode 100644 rhel/usr_lib_systemd_system_openvswitch.service
>  delete mode 100644 rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service
>  delete mode 100644 rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
>  delete mode 100644 rhel/usr_lib_systemd_system_ovsdb-server.service
>  delete mode 100644 rhel/usr_lib_udev_rules.d_91-vfio.rules
>  delete mode 100644 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
>  delete mode 100755 rhel/usr_share_openvswitch_scripts_ovs-systemd-reload
>  delete mode 100644 rhel/usr_share_openvswitch_scripts_sysconfig.template
>  delete mode 100644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template
>
> diff --git a/rhel/automake.mk b/rhel/automake.mk
> index 1c5bf153c..be7c275a7 100644
> --- a/rhel/automake.mk
> +++ b/rhel/automake.mk
> @@ -8,83 +8,26 @@
>  EXTRA_DIST += \
>         rhel/README.RHEL.rst \
>         rhel/automake.mk \
> -       rhel/etc_init.d_openvswitch \
> -       rhel/etc_logrotate.d_openvswitch \
> -       rhel/etc_openvswitch_default.conf \
> -       rhel/etc_sysconfig_network-scripts_ifdown-ovs \
> -       rhel/etc_sysconfig_network-scripts_ifup-ovs \
> -       rhel/openvswitch-dkms.spec \
> -       rhel/openvswitch-dkms.spec.in \
> -       rhel/kmod-openvswitch-rhel6.spec \
> -       rhel/kmod-openvswitch-rhel6.spec.in \
> -       rhel/openvswitch-kmod-fedora.spec \
> -       rhel/openvswitch-kmod-fedora.spec.in \
> -       rhel/openvswitch.spec \
> -       rhel/openvswitch.spec.in \
> -       rhel/openvswitch-fedora.spec \
> -       rhel/openvswitch-fedora.spec.in \
>         rhel/ovn-fedora.spec \
>         rhel/ovn-fedora.spec.in \
> -       rhel/usr_share_openvswitch_scripts_ovs-systemd-reload \
> -       rhel/usr_share_openvswitch_scripts_sysconfig.template \
> -       rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
> -       rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh \
> -       rhel/usr_lib_udev_rules.d_91-vfio.rules \
> -       rhel/usr_lib_systemd_system_openvswitch.service \
> -       rhel/usr_lib_systemd_system_ovsdb-server.service \
> -       rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \
> -       rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service \
>         rhel/usr_lib_systemd_system_ovn-controller.service \
>         rhel/usr_lib_systemd_system_ovn-controller-vtep.service \
>         rhel/usr_lib_systemd_system_ovn-northd.service \
> -       rhel/usr_lib_systemd_system_openvswitch-ipsec.service \
>         rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \
>         rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml
>
> -DISTCLEANFILES += rhel/usr_lib_systemd_system_ovs-vswitchd.service
> -
>  update_rhel_spec = \
>    $(AM_V_GEN)($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \
>      < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \
>    if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
>
> -$(srcdir)/rhel/openvswitch-dkms.spec: rhel/openvswitch-dkms.spec.in $(top_builddir)/config.status
> -       $(update_rhel_spec)
> -
> -$(srcdir)/rhel/kmod-openvswitch-rhel6.spec: rhel/kmod-openvswitch-rhel6.spec.in $(top_builddir)/config.status
> -       $(update_rhel_spec)
> -
> -$(srcdir)/rhel/openvswitch-kmod-fedora.spec: rhel/openvswitch-kmod-fedora.spec.in $(top_builddir)/config.status
> -       $(update_rhel_spec)
> -
> -$(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config.status
> -       $(update_rhel_spec)
> -
> -$(srcdir)/rhel/openvswitch-fedora.spec: rhel/openvswitch-fedora.spec.in $(top_builddir)/config.status
> -       $(update_rhel_spec)
> -
>  RPMBUILD_TOP := $(abs_top_builddir)/rpm/rpmbuild
>  RPMBUILD_OPT ?= --without check
>
> -# Build user-space RPMs
> -rpm-fedora: dist $(srcdir)/rhel/openvswitch-fedora.spec
> -       ${MKDIR_P} ${RPMBUILD_TOP}/SOURCES
> -       cp ${DIST_ARCHIVES} ${RPMBUILD_TOP}/SOURCES
> -       rpmbuild ${RPMBUILD_OPT} \
> -                 -D "_topdir ${RPMBUILD_TOP}" \
> -                 -ba $(srcdir)/rhel/openvswitch-fedora.spec
> -
> -rpm-fedora-ovn: dist $(srcdir)/rhel/ovn-fedora.spec
> +rpm-fedora: dist $(srcdir)/rhel/ovn-fedora.spec
>         ${MKDIR_P} ${RPMBUILD_TOP}/SOURCES
>         cp ${DIST_ARCHIVES} ${RPMBUILD_TOP}/SOURCES
>         rpmbuild ${RPMBUILD_OPT} \
>                   -D "_topdir ${RPMBUILD_TOP}" \
>                   -ba $(srcdir)/rhel/ovn-fedora.spec
>
> -# Build kernel datapath RPM
> -rpm-fedora-kmod: dist $(srcdir)/rhel/openvswitch-kmod-fedora.spec
> -       ${MKDIR_P} ${RPMBUILD_TOP}/SOURCES
> -       cp ${DIST_ARCHIVES} ${RPMBUILD_TOP}/SOURCES
> -       rpmbuild -D "kversion $(shell uname -r)" ${RPMBUILD_OPT} \
> -                 -D "_topdir ${RPMBUILD_TOP}" \
> -                 -ba $(srcdir)/rhel/openvswitch-kmod-fedora.spec
> diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
> deleted file mode 100755
> index 7a4cfbab5..000000000
> --- a/rhel/etc_init.d_openvswitch
> +++ /dev/null
> @@ -1,102 +0,0 @@
> -#!/bin/sh
> -#
> -# openvswitch
> -#
> -# chkconfig: 2345 09 91
> -# description: Manage Open vSwitch kernel modules and user-space daemons
> -
> -# Copyright (C) 2009, 2010, 2011, 2013 Nicira, Inc.
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#     http://www.apache.org/licenses/LICENSE-2.0
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -### BEGIN INIT INFO
> -# Provides:          openvswitch
> -# Required-Start:
> -# Required-Stop:
> -# Default-Start:     2 3 4 5
> -# Default-Stop:      0 1 6
> -# Short-Description: Open vSwitch switch
> -### END INIT INFO
> -
> -SYSTEMCTL_SKIP_REDIRECT=yes
> -SYSTEMD_NO_WRAP=yes
> -
> -. /usr/share/openvswitch/scripts/ovs-lib || exit 1
> -test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
> -
> -start () {
> -    set ovs_ctl ${1-start}
> -    set "$@" --system-id=random
> -    if test X"$FORCE_COREFILES" != X; then
> -        set "$@" --force-corefiles="$FORCE_COREFILES"
> -    fi
> -    if test X"$OVSDB_SERVER_PRIORITY" != X; then
> -        set "$@" --ovsdb-server-priority="$OVSDB_SERVER_PRIORITY"
> -    fi
> -    if test X"$VSWITCHD_PRIORITY" != X; then
> -        set "$@" --ovs-vswitchd-priority="$VSWITCHD_PRIORITY"
> -    fi
> -    if test X"$VSWITCHD_MLOCKALL" != X; then
> -        set "$@" --mlockall="$VSWITCHD_MLOCKALL"
> -    fi
> -    set "$@" $OVS_CTL_OPTS
> -    "$@"
> -
> -    touch /var/lock/subsys/openvswitch
> -}
> -
> -stop () {
> -    ovs_ctl stop
> -    rm -f /var/lock/subsys/openvswitch
> -}
> -
> -restart () {
> -    if [ "$1" = "--save-flows=yes" ]; then
> -        start restart
> -    else
> -        stop
> -        start
> -    fi
> -}
> -
> -case $1 in
> -    start)
> -        start
> -        ;;
> -    stop)
> -        stop
> -        ;;
> -    restart)
> -        shift
> -        restart "$@"
> -        ;;
> -    reload|force-reload)
> -        # Nothing to do.
> -        ;;
> -    status)
> -        ovs_ctl status
> -        exit $?
> -        ;;
> -    version)
> -        ovs_ctl version
> -        ;;
> -    force-reload-kmod)
> -        start force-reload-kmod
> -        ;;
> -    help)
> -        printf "$0 [start|stop|restart|reload|force-reload|status|version|force-reload-kmod]\n"
> -        ;;
> -    *)
> -        printf "Unknown command: $1\n"
> -        exit 1
> -        ;;
> -esac
> diff --git a/rhel/etc_logrotate.d_openvswitch b/rhel/etc_logrotate.d_openvswitch
> deleted file mode 100644
> index f4302ffbc..000000000
> --- a/rhel/etc_logrotate.d_openvswitch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -# Copyright (C) 2009, 2010, 2011, 2012 Nicira, Inc.
> -#
> -# Copying and distribution of this file, with or without modification,
> -# are permitted in any medium without royalty provided the copyright
> -# notice and this notice are preserved.  This file is offered as-is,
> -# without warranty of any kind.
> -
> -/var/log/openvswitch/*.log {
> -    su root root
> -    daily
> -    compress
> -    sharedscripts
> -    missingok
> -    postrotate
> -        # Tell Open vSwitch daemons to reopen their log files
> -        if [ -d /var/run/openvswitch ]; then
> -            for ctl in /var/run/openvswitch/*.ctl; do
> -                ovs-appctl -t "$ctl" vlog/reopen 2>/dev/null || :
> -            done
> -        fi
> -    endscript
> -}
> diff --git a/rhel/etc_openvswitch_default.conf b/rhel/etc_openvswitch_default.conf
> deleted file mode 100644
> index c74417db6..000000000
> --- a/rhel/etc_openvswitch_default.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# DO NOT EDIT THIS FILE
> -
> -# The following is the *default* configuration for the openvswitch user ID.
> -# This is for backward compatibility.
> -OVS_USER_ID="root:root"
> diff --git a/rhel/etc_sysconfig_network-scripts_ifdown-ovs b/rhel/etc_sysconfig_network-scripts_ifdown-ovs
> deleted file mode 100755
> index 63d048b22..000000000
> --- a/rhel/etc_sysconfig_network-scripts_ifdown-ovs
> +++ /dev/null
> @@ -1,71 +0,0 @@
> -#!/bin/bash
> -
> -# Copyright (c) 2011 Alexey I. Froloff.
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#     http://www.apache.org/licenses/LICENSE-2.0
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -
> -. /etc/init.d/functions
> -
> -cd /etc/sysconfig/network-scripts
> -. ./network-functions
> -
> -[ -f ../network ] && . ../network
> -
> -CONFIG=${1}
> -TIMEOUT=10
> -
> -source_config
> -
> -. /etc/sysconfig/network
> -
> -OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${REAL_DEVICETYPE}"
> -
> -if [ ! -x ${OTHERSCRIPT} ]; then
> -    OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-eth"
> -fi
> -
> -SERVICE_UNIT=/usr/lib/systemd/system/ovsdb-server.service
> -if [ -f $SERVICE_UNIT ] && [ -x /usr/bin/systemctl ]; then
> -        if ! systemctl --quiet is-active ovsdb-server.service; then
> -                systemctl start ovsdb-server.service
> -        fi
> -else
> -        if [ ! -f /var/lock/subsys/openvswitch ]; then
> -                /sbin/service openvswitch start
> -        fi
> -fi
> -
> -case "$TYPE" in
> -        OVSBridge|OVSUserBridge)
> -                ${OTHERSCRIPT} ${CONFIG} $2
> -                retval=$?
> -                ovs-vsctl -t ${TIMEOUT} -- --if-exists del-br "$DEVICE"
> -                ;;
> -        OVSPort|OVSIntPort|OVSBond)
> -                ${OTHERSCRIPT} ${CONFIG} $2
> -                retval=$?
> -                ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE"
> -                ;;
> -        OVSPatchPort|OVSTunnel)
> -                ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE"
> -                ;;
> -        OVSDPDKPort|OVSDPDKRPort|OVSDPDKVhostUserPort|OVSDPDKBond)
> -                ovs-vsctl -t ${TIMEOUT} -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE"
> -                ;;
> -        *)
> -                echo $"Invalid OVS interface type $TYPE"
> -                exit 1
> -                ;;
> -esac
> -
> -exit $retval
> diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs
> deleted file mode 100755
> index b01461cc4..000000000
> --- a/rhel/etc_sysconfig_network-scripts_ifup-ovs
> +++ /dev/null
> @@ -1,226 +0,0 @@
> -#!/bin/bash
> -
> -# Copyright (c) 2011 Alexey I. Froloff.
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#     http://www.apache.org/licenses/LICENSE-2.0
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -
> -. /etc/init.d/functions
> -
> -cd /etc/sysconfig/network-scripts
> -. ./network-functions
> -
> -[ -f ../network ] && . ../network
> -
> -CONFIG=${1}
> -TIMEOUT=10
> -
> -need_config ${CONFIG}
> -
> -source_config
> -
> -OTHERSCRIPT="/etc/sysconfig/network-scripts/ifup-${REAL_DEVICETYPE}"
> -
> -if [ ! -x ${OTHERSCRIPT} ]; then
> -        OTHERSCRIPT="/etc/sysconfig/network-scripts/ifup-eth"
> -fi
> -
> -check_recursion ()
> -{
> -        [ -n "${UPPEDSTACK}" ] && for _r in ${UPPEDSTACK}; do
> -                [ "$_r" = "$1" ] && return 1
> -        done
> -
> -        return 0
> -}
> -
> -ifup_ovs_bridge ()
> -{
> -        if ovs-vsctl br-exists "${OVS_BRIDGE}"; then :; else
> -                /sbin/ifup "${OVS_BRIDGE}"
> -        fi
> -}
> -
> -if [ -z "${UPPEDSTACK}" ]; then
> -        UPPEDSTACK="${DEVICE}"
> -fi
> -
> -[ -n "${OVSREQUIRES}" ] && for _i in ${OVSREQUIRES}; do
> -        if ( check_recursion "$_i" ); then
> -                UPPEDSTACK="${UPPEDSTACK} $_i" /sbin/ifup "$_i"
> -        fi
> -done
> -
> -SERVICE_UNIT=/usr/lib/systemd/system/openvswitch.service
> -if [ -f $SERVICE_UNIT ] && [ -x /usr/bin/systemctl ]; then
> -        if ! systemctl --quiet is-active openvswitch.service; then
> -                systemctl start openvswitch.service
> -        fi
> -else
> -        if [ ! -f /var/lock/subsys/openvswitch ]; then
> -                /sbin/service openvswitch start
> -        fi
> -fi
> -
> -case "$TYPE" in
> -        OVSBridge|OVSUserBridge)
> -                # If bridge already exists and is up, it has been configured through
> -                # other cases like OVSPort, OVSIntPort and OVSBond. If it is down or
> -                # it does not exist, create it. It is possible for a bridge to exist
> -                # because it remained in the OVSDB for some reason, but it won't be up.
> -                if [ "${TYPE}" = "OVSUserBridge" ]; then
> -                        DATAPATH="netdev"
> -                fi
> -                if check_device_down "${DEVICE}"; then
> -                        ovs-vsctl -t ${TIMEOUT} -- --may-exist add-br "$DEVICE" $OVS_OPTIONS \
> -                        ${OVS_EXTRA+-- $OVS_EXTRA} \
> -                        ${STP+-- set bridge "$DEVICE" stp_enable="${STP}"} \
> -                        ${DATAPATH+-- set bridge "$DEVICE" datapath_type="$DATAPATH"}
> -                else
> -                        OVSBRIDGECONFIGURED="yes"
> -                fi
> -
> -                # If MACADDR is provided in the interface configuration file,
> -                # we need to set it using ovs-vsctl; setting it with the "ip"
> -                # command in ifup-eth does not make the change persistent.
> -                if [ -n "$MACADDR" ]; then
> -                        ovs-vsctl -t ${TIMEOUT} -- set bridge "$DEVICE" \
> -                                other-config:hwaddr="$MACADDR"
> -                fi
> -
> -                # When dhcp is enabled, the assumption is that there will be a port to
> -                # attach (otherwise, we can't reach out for dhcp). So, we do not
> -                # configure the bridge through rhel's ifup infrastructure unless
> -                # it is being configured after the port has been configured.
> -                # The "OVSINTF" is set only after the port is configured.
> -                if [ "${OVSBOOTPROTO}" = "dhcp" ] && [ -n "${OVSINTF}" ]; then
> -                        case " ${OVSDHCPINTERFACES} " in
> -                                *" ${OVSINTF} "*)
> -                                        BOOTPROTO=dhcp ${OTHERSCRIPT} ${CONFIG}
> -                                ;;
> -                        esac
> -                fi
> -
> -                # When dhcp is not enabled, it is possible that someone may want
> -                # a standalone bridge (i.e it may not have any ports). Configure it.
> -                if [ "${OVSBOOTPROTO}" != "dhcp" ] && [ -z "${OVSINTF}" ] && \
> -                        [ "${OVSBRIDGECONFIGURED}" != "yes" ]; then
> -                        ${OTHERSCRIPT} ${CONFIG}
> -                fi
> -                exit 0
> -                ;;
> -        OVSPort)
> -                ifup_ovs_bridge
> -                ${OTHERSCRIPT} ${CONFIG} ${2}
> -                # The port might be already in the database but not yet
> -                # in the datapath.  So, remove the stale interface first.
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
> -                OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
> -                ;;
> -        OVSIntPort)
> -                ifup_ovs_bridge
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS \
> -                        -- set Interface "$DEVICE" type=internal ${OVS_EXTRA+-- $OVS_EXTRA}
> -                if [ -n "${OVSDHCPINTERFACES}" ]; then
> -                        for _iface in ${OVSDHCPINTERFACES}; do
> -                                /sbin/ifup ${_iface}
> -                        done
> -                fi
> -                BOOTPROTO="${OVSBOOTPROTO}" ${OTHERSCRIPT} ${CONFIG} ${2}
> -                ;;
> -        OVSBond)
> -                ifup_ovs_bridge
> -                for _iface in $BOND_IFACES; do
> -                        /sbin/ifup ${_iface}
> -                done
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
> -                OVSINTF=${DEVICE} /sbin/ifup "$OVS_BRIDGE"
> -                ;;
> -        OVSTunnel)
> -                ifup_ovs_bridge
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS \
> -                        -- set Interface "$DEVICE" type=$OVS_TUNNEL_TYPE $OVS_TUNNEL_OPTIONS ${OVS_EXTRA+-- $OVS_EXTRA}
> -                ;;
> -        OVSPatchPort)
> -                ifup_ovs_bridge
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS \
> -                        -- set Interface "$DEVICE" type=patch options:peer="${OVS_PATCH_PEER}" ${OVS_EXTRA+-- $OVS_EXTRA}
> -                ;;
> -        OVSDPDKPort)
> -                ifup_ovs_bridge
> -                BRIDGE_MAC_ORIG=$(get_hwaddr $OVS_BRIDGE)
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS \
> -                        -- set Interface "$DEVICE" type=dpdk ${OVS_EXTRA+-- $OVS_EXTRA}
> -                BRIDGE_MAC=$(get_hwaddr $OVS_BRIDGE)
> -                # The bridge may change its MAC to be the lower one among all its
> -                # ports. If that happens, bridge configuration (e.g. routes) will
> -                # be lost. Restore the post-up bridge configuration again.
> -                if [ "$BRIDGE_MAC_ORIG" != "$BRIDGE_MAC" ]; then
> -                        ${OTHERSCRIPT} "$OVS_BRIDGE"
> -                fi
> -                ;;
> -        OVSDPDKRPort)
> -                ifup_ovs_bridge
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS \
> -                        -- set Interface "$DEVICE" type=dpdkr ${OVS_EXTRA+-- $OVS_EXTRA}
> -                ;;
> -        OVSDPDKVhostUserPort)
> -                ifup_ovs_bridge
> -                PORT_TYPE="dpdkvhostuser"
> -                PORT_PATH=""
> -                if [ "$OVS_PORT_MODE" == "client" ]; then
> -                        PORT_TYPE="dpdkvhostuserclient"
> -                        PORT_PATH="options:vhost-server-path=${OVS_PORT_PATH}"
> -                fi
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS \
> -                        -- set Interface "$DEVICE" type=$PORT_TYPE \
> -                        $PORT_PATH \
> -                        ${OVS_EXTRA+-- $OVS_EXTRA}
> -                ;;
> -        OVSDPDKBond)
> -                ifup_ovs_bridge
> -                BRIDGE_MAC_ORIG=$(get_hwaddr $OVS_BRIDGE)
> -                for _iface in $BOND_IFACES; do
> -                        IFACE_TYPES="${IFACE_TYPES} -- set interface ${_iface} type=dpdk"
> -                done
> -                ovs-vsctl -t ${TIMEOUT} \
> -                        -- --if-exists del-port "$OVS_BRIDGE" "$DEVICE" \
> -                        -- add-bond "$OVS_BRIDGE" "$DEVICE" ${BOND_IFACES} $OVS_OPTIONS ${IFACE_TYPES} ${OVS_EXTRA+-- $OVS_EXTRA}
> -                BRIDGE_MAC=$(get_hwaddr $OVS_BRIDGE)
> -                # The bridge may change its MAC to be the lower one among all its
> -                # ports. If that happens, bridge configuration (e.g. routes) will
> -                # be lost. Restore the post-up bridge configuration again.
> -                if [ "$BRIDGE_MAC_ORIG" != "$BRIDGE_MAC" ]; then
> -                        ${OTHERSCRIPT} "$OVS_BRIDGE"
> -                fi
> -                ;;
> -        *)
> -                echo $"Invalid OVS interface type $TYPE"
> -                exit 1
> -                ;;
> -esac
> diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in
> deleted file mode 100644
> index 7d3d9b498..000000000
> --- a/rhel/kmod-openvswitch-rhel6.spec.in
> +++ /dev/null
> @@ -1,122 +0,0 @@
> -# Spec file for Open vSwitch kernel modules on Red Hat Enterprise
> -# Linux 6.
> -
> -# Copyright (C) 2011, 2012, 2018 Nicira, Inc.
> -#
> -# Copying and distribution of this file, with or without modification,
> -# are permitted in any medium without royalty provided the copyright
> -# notice and this notice are preserved.  This file is offered as-is,
> -# without warranty of any kind.
> -
> -%define oname openvswitch
> -
> -Name:           kmod-%{oname}
> -Version:        @VERSION@
> -Release:        1%{?dist}
> -Summary:        Open vSwitch kernel module
> -
> -Group:          System/Kernel
> -License:        GPLv2
> -URL:            http://openvswitch.org/
> -Source0:        %{oname}-%{version}.tar.gz
> -BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> -
> -# Without this we get an empty openvswitch-debuginfo package (whose name
> -# conflicts with the openvswitch-debuginfo package for OVS userspace).
> -%undefine _enable_debug_packages
> -
> -%define kernel_source_extended() /usr/src/kernels/%{2}$([ %{1} = default ] || echo ".%{1}")
> -
> -# Use -D 'kversion 2.6.32-131.6.1.el6.x86_64' to build package
> -# for specified kernel version.
> -# Use -D 'kversion 3.10.0-693.1.1.el7.x86_64 3.10.0-693.17.1.el7.x86_64'
> -# to build package for mulitple kernel versions in the same package
> -# This only works for kernel 3.10.0 major revision 693 (RHEL 7.4)
> -# and major revision 327 (RHEL 7.2)
> -# By default, build against the latest installed kernel-devel
> -%{!?kversion:%global kversion %(rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1| sed "s/^kernel.*-devel-//")}
> -
> -# Use -D 'kflavors default debug kdump' to build packages for
> -# specified kernel variants.
> -%{!?kflavors:%global kflavors default}
> -
> -%description
> -Open vSwitch Linux kernel module.
> -
> -%prep
> -
> -%setup -n %{oname}-%{version}
> -
> -%build
> -for kv in %{kversion}; do
> -    for flavor in %{kflavors}; do
> -        mkdir -p _$flavor/_$kv
> -        (cd _$flavor/_$kv && ../../configure --with-linux="%{kernel_source_extended $flavor $kv}")
> -        %{__make} -C _$flavor/_$kv/datapath/linux %{?_smp_mflags}
> -        done
> -done
> -
> -%install
> -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
> -export INSTALL_MOD_DIR=extra/%{oname}
> -for kv in %{kversion}; do
> -    for flavor in %{kflavors} ; do
> -        make -C %{kernel_source_extended $flavor $kv} modules_install \
> -                M="`pwd`"/_$flavor/_$kv/datapath/linux
> -        # Cleanup unnecessary kernel-generated module dependency files.
> -        find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \;
> -    done
> -done
> -install -d %{buildroot}%{_sysconfdir}/depmod.d/
> -for kv in %{kversion}; do
> -    for module in %{buildroot}/lib/modules/$kv/$INSTALL_MOD_DIR/*.ko;
> -    do
> -        modname="$(basename ${module})"
> -        grep -qsPo "^\s*override ${modname%.ko} \* extra\/%{oname}" %{oname}.conf || \
> -            echo "override ${modname%.ko} * extra/%{oname}" >> %{oname}.conf
> -        grep -qsPo "^\s*override ${modname%.ko} \* weak-updates\/%{oname}" %{oname}.conf || \
> -            echo "override ${modname%.ko} * weak-updates/%{oname}" >> %{oname}.conf
> -    done
> -done
> -install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/
> -install -d -m 0755 $RPM_BUILD_ROOT/usr/share/%{oname}/scripts
> -install -p -m 0755 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh \
> -    $RPM_BUILD_ROOT/usr/share/%{oname}/scripts/ovs-kmod-manage.sh
> -
> -%post
> -current_kernel=$(uname -r)
> -IFS=. read installed_major installed_minor installed_micro installed_arch \
> -    installed_build <<<"${current_kernel##*-}"
> -if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then
> -    # Workaround for RHEL 7.2 and 7.4
> -    if [ -x "/usr/share/%{oname}/scripts/ovs-kmod-manage.sh" ]; then
> -        /usr/share/%{oname}/scripts/ovs-kmod-manage.sh
> -    fi
> -else
> -    # Ensure that modprobe will find our modules.
> -    for k in $(cd /lib/modules && /bin/ls); do
> -        [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k"
> -    done
> -    if [ -x "/sbin/weak-modules" ]; then
> -        rpm -ql kmod-%{oname} | grep '\.ko$' | \
> -            /sbin/weak-modules --add-modules
> -    fi
> -fi
> -
> -%postun
> -if [ "$1" = 0 ]; then  # Erase, not upgrade
> -    for kname in `ls -d /lib/modules/*`
> -    do
> -        rm -rf $kname/weak-updates/openvswitch
> -    done
> -fi
> -/sbin/depmod -a
> -
> -%files
> -%defattr(644,root,root,755)
> -/etc/depmod.d/%{oname}.conf
> -/lib/modules/
> -%attr(755,root,root) /usr/share/%{oname}/scripts/ovs-kmod-manage.sh
> -
> -%clean
> -rm -rf $RPM_BUILD_ROOT
> diff --git a/rhel/openvswitch-dkms.spec.in b/rhel/openvswitch-dkms.spec.in
> deleted file mode 100644
> index a47c038fd..000000000
> --- a/rhel/openvswitch-dkms.spec.in
> +++ /dev/null
> @@ -1,100 +0,0 @@
> -# Spec file for Open vSwitch kernel modules using DKMS.
> -#
> -# Copyright (C) 2015 Nicira, Inc.
> -#
> -# Copying and distribution of this file, with or without modification,
> -# are permitted in any medium without royalty provided the copyright
> -# notice and this notice are preserved.  This file is offered as-is,
> -# without warranty of any kind.
> -
> -%define oname openvswitch
> -
> -Name:             %{oname}-dkms
> -Version:          @VERSION@
> -Release:          1%{?dist}
> -Summary:          Open vSwitch kernel module
> -
> -Group:            System/Kernel
> -License:          GPLv2
> -URL:              http://openvswitch.org/
> -Source:           %{oname}-%{version}.tar.gz
> -Requires:         autoconf, gcc, make
> -Requires(post):   dkms
> -Requires(preun):  dkms
> -BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> -
> -# Without this we get an empty openvswitch-debuginfo package (whose name
> -# conflicts with the openvswitch-debuginfo package for OVS userspace).
> -%undefine _enable_debug_packages
> -
> -
> -%description
> -Open vSwitch Linux kernel module.
> -
> -
> -%prep
> -%setup -n %{oname}-%{version}
> -
> -cat > %{oname}.conf << EOF
> -override %{oname} * extra/%{oname}
> -override %{oname} * weak-updates/%{oname}
> -EOF
> -
> -
> -%build
> -# for running the '%{__make} -C datapath print-build-modules' below.
> -./configure
> -
> -
> -%install
> -%{__rm} -rf %{buildroot}
> -
> -# Kernel module sources install for dkms
> -%{__mkdir_p} %{buildroot}%{_usrsrc}/%{oname}-%{version}/
> -%{__cp} -r * %{buildroot}%{_usrsrc}/%{oname}-%{version}/
> -
> -# check we can get kernel module names
> -%{__make} -C datapath print-build-modules
> -
> -# Prepare dkms.conf
> -cat > %{buildroot}%{_usrsrc}/%{oname}-%{version}/dkms.conf << EOF
> -MODULES=( `%{__make} -C datapath print-build-modules | grep -v make` )
> -
> -PACKAGE_NAME="openvswitch"
> -PACKAGE_VERSION="%{version}-%{release}"
> -MAKE="./configure --with-linux='\${kernel_source_dir}' && make -C datapath/linux"
> -for __idx in \${!MODULES[@]}; do
> -    BUILT_MODULE_NAME[__idx]=\${MODULES[__idx]}
> -    BUILT_MODULE_LOCATION[__idx]=datapath/linux/
> -    DEST_MODULE_LOCATION[__idx]=/kernel/drivers/net/openvswitch/
> -done
> -AUTOINSTALL=yes
> -EOF
> -
> -install -d %{buildroot}%{_sysconfdir}/depmod.d/
> -install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/
> -
> -
> -%post
> -# Add to DKMS registry
> -isadded=`dkms status -m "%{oname}" -v "%{version}"`
> -if [ "x${isadded}" = "x" ] ; then
> -    dkms add -m "%{oname}" -v "%{version}" || :
> -fi
> -dkms build -m "%{oname}" -v "%{version}" || :
> -dkms install -m "%{oname}" -v "%{version}" --force || :
> -
> -
> -%preun
> -# Remove all versions from DKMS registry
> -dkms remove -m "%{oname}" -v "%{version}" --all || :
> -
> -
> -%clean
> -%{__rm} -rf %{buildroot}
> -
> -
> -%files
> -%defattr(-,root,root)
> -%{_usrsrc}/%{oname}-%{version}/
> -/etc/depmod.d/openvswitch.conf
> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
> deleted file mode 100644
> index ce728b4f0..000000000
> --- a/rhel/openvswitch-fedora.spec.in
> +++ /dev/null
> @@ -1,540 +0,0 @@
> -# Spec file for Open vSwitch.
> -
> -# Copyright (C) 2009, 2010, 2013, 2014, 2015, 2016 Nicira Networks, Inc.
> -#
> -# Copying and distribution of this file, with or without modification,
> -# are permitted in any medium without royalty provided the copyright
> -# notice and this notice are preserved.  This file is offered as-is,
> -# without warranty of any kind.
> -#
> -# If tests have to be skipped while building, specify the '--without check'
> -# option. For example:
> -#     rpmbuild -bb --without check rhel/openvswitch-fedora.spec
> -#
> -# Support for executing kernel data path tests under rpmbuild is
> -# provided, however this is intended for use only in test environments
> -# and should not be used otherwise (these tests require root privileges).
> -# These tests can be executed, for example, via:
> -#    rpmbuild -rb --with check_datapath_kernel openvswitch-fedora.src.rpm
> -#
> -# These tests will use the currently installed OVS kernel modules, when
> -# testing out of tree kernel modules the appropriate openvswitch-kmod
> -# package should be installed first.
> -
> -#%define kernel 2.6.40.4-5.fc15.x86_64
> -
> -# If libcap-ng isn't available and there is no need for running OVS
> -# as regular user, specify the '--without libcapng'
> -%bcond_without libcapng
> -# To enable DPDK support, specify '--with dpdk' when building
> -%bcond_with dpdk
> -# Enable Python 3 by specifying '--with build_python3'.
> -# This is enabled by default for versions of the distribution that
> -# have Python 3 by default (Fedora > 22).
> -%bcond_with build_python3
> -
> -# Enable PIE, bz#955181
> -%global _hardened_build 1
> -
> -# some distros (e.g: RHEL-7) don't define _rundir macro yet
> -# Fedora 15 onwards uses /run as _rundir
> -%if 0%{!?_rundir:1}
> -%define _rundir /run
> -%endif
> -
> -# define the python package prefix based on distribution version so that we can
> -# simultaneously support RHEL-based and later Fedora versions in this spec file.
> -%if 0%{?fedora} >= 25
> -%define _py2 python2
> -%endif
> -
> -%if 0%{?rhel} || 0%{?fedora} < 25
> -%define _py2 python
> -%endif
> -
> -
> -Name: openvswitch
> -Summary: Open vSwitch
> -Group: System Environment/Daemons
> -URL: http://www.openvswitch.org/
> -Version: @VERSION@
> -
> -# Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
> -# lib/sflow*.[ch] files are SISSL
> -# datapath/ is GPLv2 (although not built into any of the binary packages)
> -License: ASL 2.0 and LGPLv2+ and SISSL
> -Release: 1%{?dist}
> -Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz
> -
> -BuildRequires: gcc gcc-c++
> -BuildRequires: autoconf automake libtool
> -BuildRequires: systemd-units openssl openssl-devel
> -BuildRequires: %{_py2}-devel
> -%if 0%{?fedora} > 22 || %{with build_python3}
> -BuildRequires: python3-devel
> -%endif
> -BuildRequires: desktop-file-utils
> -BuildRequires: groff graphviz
> -BuildRequires: checkpolicy, selinux-policy-devel
> -BuildRequires: /usr/bin/sphinx-build
> -# make check dependencies
> -BuildRequires: %{_py2}-twisted%{?rhel:-core} %{_py2}-zope-interface %{_py2}-six
> -BuildRequires: procps-ng
> -%if %{with libcapng}
> -BuildRequires: libcap-ng libcap-ng-devel
> -%endif
> -%if %{with dpdk}
> -BuildRequires: libpcap-devel numactl-devel
> -BuildRequires: dpdk-devel >= 17.05.1
> -Provides: %{name}-dpdk = %{version}-%{release}
> -%endif
> -BuildRequires: unbound unbound-devel
> -
> -Requires: openssl hostname iproute module-init-tools unbound
> -#Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3
> -#Requires: kernel >= 3.15.0-0
> -
> -Requires(pre): shadow-utils
> -Requires(post): /bin/sed
> -Requires(post): systemd-units
> -Requires(preun): systemd-units
> -Requires(postun): systemd-units
> -Obsoletes: openvswitch-controller <= 0:2.1.0-1
> -
> -# to skip running checks, pass --without check
> -%bcond_without check
> -%bcond_with check_datapath_kernel
> -
> -%description
> -Open vSwitch provides standard network bridging functions and
> -support for the OpenFlow protocol for remote per-flow control of
> -traffic.
> -
> -%package selinux-policy
> -Summary: Open vSwitch SELinux policy
> -License: ASL 2.0
> -BuildArch: noarch
> -Requires: selinux-policy-targeted
> -
> -%description selinux-policy
> -Tailored Open vSwitch SELinux policy
> -
> -%package -n %{_py2}-openvswitch
> -Summary: Open vSwitch python2 bindings
> -License: ASL 2.0
> -BuildArch: noarch
> -Requires: %{_py2}
> -Requires: %{_py2}-six
> -%{?python_provide:%python_provide python2-openvswitch = %{version}-%{release}}
> -%description -n %{_py2}-openvswitch
> -Python bindings for the Open vSwitch database
> -
> -%if 0%{?fedora} > 22 || %{with build_python3}
> -%package -n python3-openvswitch
> -Summary: Open vSwitch python3 bindings
> -License: ASL 2.0
> -BuildArch: noarch
> -Requires: python3
> -Requires: python3-six
> -%{?python_provide:%python_provide python3-openvswitch = %{version}-%{release}}
> -
> -%description -n python3-openvswitch
> -Python bindings for the Open vSwitch database
> -%endif
> -
> -%package test
> -Summary: Open vSwitch testing utilities
> -License: ASL 2.0
> -BuildArch: noarch
> -Requires: %{_py2}-openvswitch = %{version}-%{release}
> -Requires: %{_py2} %{_py2}-netifaces %{_py2}-twisted
> -
> -%description test
> -Utilities that are useful to diagnose performance and connectivity
> -issues in Open vSwitch setup.
> -
> -%package devel
> -Summary: Open vSwitch OpenFlow development package (library, headers)
> -License: ASL 2.0
> -
> -%description devel
> -This provides shared library, libopenswitch.so and the openvswitch header
> -files needed to build an external application.
> -
> -%if 0%{?rhel} > 7 || 0%{?fedora} > 28
> -%package -n network-scripts-%{name}
> -Summary: Open vSwitch legacy network service support
> -License: ASL 2.0
> -Requires: network-scripts
> -Supplements: (%{name} and network-scripts)
> -
> -%description -n network-scripts-%{name}
> -This provides the ifup and ifdown scripts for use with the legacy network
> -service.
> -%endif
> -
> -%package ipsec
> -Summary: Open vSwitch IPsec tunneling support
> -License: ASL 2.0
> -Requires: openvswitch %{_py2}-openvswitch libreswan
> -
> -%description ipsec
> -This package provides IPsec tunneling support for OVS tunnels.
> -
> -%prep
> -%setup -q
> -
> -%build
> -%configure \
> -%if %{with libcapng}
> -        --enable-libcapng \
> -%else
> -        --disable-libcapng \
> -%endif
> -%if %{with dpdk}
> -        --with-dpdk=$(dirname %{_datadir}/dpdk/*/.config) \
> -%endif
> -        --enable-ssl \
> -        --disable-static \
> -        --enable-shared \
> -        --with-pkidir=%{_sharedstatedir}/openvswitch/pki \
> -%if 0%{?fedora} > 22 || %{with build_python3}
> -        PYTHON3=%{__python3} \
> -        PYTHON=%{__python2}
> -%else
> -        PYTHON=%{__python}
> -%endif
> -
> -build-aux/dpdkstrip.py \
> -%if %{with dpdk}
> -        --dpdk \
> -%else
> -        --nodpdk \
> -%endif
> -        < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \
> -        > rhel/usr_lib_systemd_system_ovs-vswitchd.service
> -
> -make %{?_smp_mflags}
> -make selinux-policy
> -
> -%install
> -rm -rf $RPM_BUILD_ROOT
> -make install DESTDIR=$RPM_BUILD_ROOT
> -
> -install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch
> -install -d -m 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch
> -install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch
> -copy_headers() {
> -    src=$1
> -    dst=$RPM_BUILD_ROOT/$2
> -    install -d -m 0755 $dst
> -    install -m 0644 $src/*.h $dst
> -}
> -copy_headers include %{_includedir}/openvswitch
> -copy_headers include/openflow %{_includedir}/openvswitch/openflow
> -copy_headers include/openvswitch %{_includedir}/openvswitch/openvswitch
> -copy_headers include/sparse %{_includedir}/openvswitch/sparse
> -copy_headers include/sparse/arpa %{_includedir}/openvswitch/sparse/arpa
> -copy_headers include/sparse/netinet %{_includedir}/openvswitch/sparse/netinet
> -copy_headers include/sparse/sys %{_includedir}/openvswitch/sparse/sys
> -copy_headers lib %{_includedir}/openvswitch/lib
> -
> -%if %{with dpdk}
> -install -p -D -m 0644 rhel/usr_lib_udev_rules.d_91-vfio.rules \
> -        $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d/91-vfio.rules
> -%endif
> -
> -install -p -D -m 0644 \
> -        rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
> -        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/openvswitch
> -for service in openvswitch ovsdb-server ovs-vswitchd ovs-delete-transient-ports \
> -                openvswitch-ipsec; do
> -        install -p -D -m 0644 \
> -                        rhel/usr_lib_systemd_system_${service}.service \
> -                        $RPM_BUILD_ROOT%{_unitdir}/${service}.service
> -done
> -install -m 0755 rhel/etc_init.d_openvswitch \
> -        $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/openvswitch.init
> -
> -install -p -D -m 0644 rhel/etc_openvswitch_default.conf \
> -        $RPM_BUILD_ROOT/%{_sysconfdir}/openvswitch/default.conf
> -
> -install -p -D -m 0644 rhel/etc_logrotate.d_openvswitch \
> -        $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/openvswitch
> -
> -install -m 0644 vswitchd/vswitch.ovsschema \
> -        $RPM_BUILD_ROOT/%{_datadir}/openvswitch/vswitch.ovsschema
> -
> -install -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/
> -install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \
> -        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
> -install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs \
> -        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
> -
> -install -d -m 0755 $RPM_BUILD_ROOT%{python2_sitelib}
> -cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* \
> -   $RPM_BUILD_ROOT%{python2_sitelib}
> -
> -%if 0%{?fedora} > 22 || %{with build_python3}
> -install -d -m 0755 $RPM_BUILD_ROOT%{python3_sitelib}
> -cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ovs \
> -   $RPM_BUILD_ROOT%{python3_sitelib}
> -%endif
> -
> -rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/
> -
> -install -d -m 0755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch
> -
> -touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db
> -touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/.conf.db.~lock~
> -touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf
> -
> -install -p -m 644 -D selinux/openvswitch-custom.pp \
> -        $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
> -
> -install -d $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/
> -
> -install -p -D -m 0755 \
> -        rhel/usr_share_openvswitch_scripts_ovs-systemd-reload \
> -        $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs-systemd-reload
> -
> -# remove unpackaged files
> -rm -f $RPM_BUILD_ROOT%{_bindir}/ovs-parse-backtrace \
> -        $RPM_BUILD_ROOT%{_sbindir}/ovs-vlan-bug-workaround \
> -        $RPM_BUILD_ROOT%{_mandir}/man8/ovs-vlan-bug-workaround.8
> -
> -# remove ovn unpackages files
> -rm -f $RPM_BUILD_ROOT%{_bindir}/ovn*
> -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ovn*
> -rm -f $RPM_BUILD_ROOT%{_mandir}/man5/ovn*
> -rm -f $RPM_BUILD_ROOT%{_mandir}/man7/ovn*
> -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/ovn*
> -rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/ovn*
> -rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovn*
> -rm -f $RPM_BUILD_ROOT%{_includedir}/ovn/*
> -rm -f $RPM_BUILD_ROOT%{_libdir}/libovn*
> -
> -%check
> -%if %{with check}
> -    touch resolv.conf
> -    export OVS_RESOLV_CONF=$(pwd)/resolv.conf
> -    if make check TESTSUITEFLAGS='%{_smp_mflags}' RECHECK=yes; then :;
> -    else
> -        cat tests/testsuite.log
> -        exit 1
> -    fi
> -%endif
> -%if %{with check_datapath_kernel}
> -    if make check-kernel RECHECK=yes; then :;
> -    else
> -        cat tests/system-kmod-testsuite.log
> -        exit 1
> -    fi
> -%endif
> -
> -%clean
> -rm -rf $RPM_BUILD_ROOT
> -
> -%pre selinux-policy
> -%selinux_relabel_pre -s targeted
> -
> -%preun
> -%if 0%{?systemd_preun:1}
> -    %systemd_preun %{name}.service
> -%else
> -    if [ $1 -eq 0 ] ; then
> -        # Package removal, not upgrade
> -        /bin/systemctl --no-reload disable %{name}.service >/dev/null 2>&1 || :
> -        /bin/systemctl stop %{name}.service >/dev/null 2>&1 || :
> -    fi
> -%endif
> -
> -%pre
> -%if %{with libcapng}
> -getent group openvswitch >/dev/null || groupadd -r openvswitch
> -getent passwd openvswitch >/dev/null || \
> -    useradd -r -g openvswitch -d / -s /sbin/nologin \
> -    -c "Open vSwitch Daemons" openvswitch
> -
> -%if %{with dpdk}
> -    getent group hugetlbfs >/dev/null || groupadd -r hugetlbfs
> -    usermod -a -G hugetlbfs openvswitch
> -%endif
> -%endif
> -exit 0
> -
> -%post
> -%if %{with libcapng}
> -if [ $1 -eq 1 ]; then
> -    sed -i 's:^#OVS_USER_ID=:OVS_USER_ID=:' /etc/sysconfig/openvswitch
> -    sed -i 's:\(.*su\).*:\1 openvswitch openvswitch:' %{_sysconfdir}/logrotate.d/openvswitch
> -
> -%if %{with dpdk}
> -    sed -i \
> -        's@OVS_USER_ID="openvswitch:openvswitch"@OVS_USER_ID="openvswitch:hugetlbfs"@'\
> -        /etc/sysconfig/openvswitch
> -%endif
> -
> -    # In the case of upgrade, this is not needed.
> -    chown -R openvswitch:openvswitch /etc/openvswitch
> -    chown -R openvswitch:openvswitch /var/log/openvswitch
> -fi
> -%endif
> -
> -%if 0%{?systemd_post:1}
> -    %systemd_post %{name}.service
> -%else
> -    # Package install, not upgrade
> -    if [ $1 -eq 1 ]; then
> -        /bin/systemctl daemon-reload >dev/null || :
> -    fi
> -%endif
> -
> -%post selinux-policy
> -%selinux_modules_install -s targeted %{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
> -
> -%postun
> -%if 0%{?systemd_postun:1}
> -    %systemd_postun %{name}.service
> -%else
> -    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
> -%endif
> -
> -%postun selinux-policy
> -if [ $1 -eq 0 ] ; then
> -  %selinux_modules_uninstall -s targeted openvswitch-custom
> -fi
> -
> -%posttrans selinux-policy
> -%selinux_relabel_post -s targeted
> -
> -%files selinux-policy
> -%defattr(-,root,root)
> -%{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
> -
> -%files -n %{_py2}-openvswitch
> -%{python2_sitelib}/ovs
> -
> -%if 0%{?fedora} > 22 || %{with build_python3}
> -%files -n python3-openvswitch
> -%{python3_sitelib}/ovs
> -%endif
> -
> -%files test
> -%{_bindir}/ovs-test
> -%{_bindir}/ovs-vlan-test
> -%{_bindir}/ovs-l3ping
> -%{_bindir}/ovs-pcap
> -%{_bindir}/ovs-tcpdump
> -%{_bindir}/ovs-tcpundump
> -%{_mandir}/man8/ovs-test.8*
> -%{_mandir}/man8/ovs-vlan-test.8*
> -%{_mandir}/man8/ovs-l3ping.8*
> -%{_mandir}/man1/ovs-pcap.1*
> -%{_mandir}/man8/ovs-tcpdump.8*
> -%{_mandir}/man1/ovs-tcpundump.1*
> -%{python2_sitelib}/ovstest
> -
> -%files devel
> -%{_libdir}/lib*.so
> -%{_libdir}/pkgconfig/*.pc
> -%{_includedir}/openvswitch/*
> -%{_includedir}/openflow/*
> -%exclude %{_libdir}/*.la
> -
> -%if 0%{?rhel} > 7 || 0%{?fedora} > 28
> -%files -n network-scripts-%{name}
> -%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
> -%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
> -%endif
> -
> -%files
> -%if %{with libcapng}
> -%defattr(-,openvswitch,openvswitch)
> -%else
> -%defattr(-,root,root)
> -%endif
> -%dir %{_sysconfdir}/openvswitch
> -%{_sysconfdir}/openvswitch/default.conf
> -%config %ghost %{_sysconfdir}/openvswitch/conf.db
> -%ghost %{_sysconfdir}/openvswitch/.conf.db.~lock~
> -%config %ghost %{_sysconfdir}/openvswitch/system-id.conf
> -%config(noreplace) %{_sysconfdir}/sysconfig/openvswitch
> -%defattr(-,root,root)
> -%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash
> -%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash
> -%config(noreplace) %{_sysconfdir}/logrotate.d/openvswitch
> -%{_unitdir}/openvswitch.service
> -%{_unitdir}/ovsdb-server.service
> -%{_unitdir}/ovs-vswitchd.service
> -%{_unitdir}/ovs-delete-transient-ports.service
> -%{_datadir}/openvswitch/scripts/openvswitch.init
> -%if ! (0%{?rhel} > 7 || 0%{?fedora} > 28)
> -%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
> -%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
> -%endif
> -%{_datadir}/openvswitch/bugtool-plugins/
> -%{_datadir}/openvswitch/scripts/ovs-bugtool-*
> -%{_datadir}/openvswitch/scripts/ovs-check-dead-ifs
> -%{_datadir}/openvswitch/scripts/ovs-lib
> -%{_datadir}/openvswitch/scripts/ovs-save
> -%{_datadir}/openvswitch/scripts/ovs-vtep
> -%{_datadir}/openvswitch/scripts/ovs-ctl
> -%{_datadir}/openvswitch/scripts/ovs-kmod-ctl
> -%{_datadir}/openvswitch/scripts/ovs-systemd-reload
> -%config %{_datadir}/openvswitch/vswitch.ovsschema
> -%config %{_datadir}/openvswitch/vtep.ovsschema
> -%{_bindir}/ovs-appctl
> -%{_bindir}/ovs-docker
> -%{_bindir}/ovs-dpctl
> -%{_bindir}/ovs-dpctl-top
> -%{_bindir}/ovs-ofctl
> -%{_bindir}/ovs-vsctl
> -%{_bindir}/ovsdb-client
> -%{_bindir}/ovsdb-tool
> -%{_bindir}/ovs-testcontroller
> -%{_bindir}/ovs-pki
> -%{_bindir}/vtep-ctl
> -%{_libdir}/lib*.so.*
> -%{_sbindir}/ovs-bugtool
> -%{_sbindir}/ovs-vswitchd
> -%{_sbindir}/ovsdb-server
> -%{_mandir}/man1/ovsdb-client.1*
> -%{_mandir}/man1/ovsdb-server.1*
> -%{_mandir}/man1/ovsdb-tool.1*
> -%{_mandir}/man5/ovsdb-server.5*
> -%{_mandir}/man5/ovs-vswitchd.conf.db.5*
> -%{_mandir}/man5/ovsdb.5*
> -%{_mandir}/man5/vtep.5*
> -%{_mandir}/man7/ovs-actions.7*
> -%{_mandir}/man7/ovs-fields.7*
> -%{_mandir}/man7/ovsdb.7*
> -%{_mandir}/man7/ovsdb-server.7*
> -%{_mandir}/man8/vtep-ctl.8*
> -%{_mandir}/man8/ovs-appctl.8*
> -%{_mandir}/man8/ovs-bugtool.8*
> -%{_mandir}/man8/ovs-ctl.8*
> -%{_mandir}/man8/ovs-dpctl.8*
> -%{_mandir}/man8/ovs-dpctl-top.8*
> -%{_mandir}/man8/ovs-kmod-ctl.8*
> -%{_mandir}/man8/ovs-ofctl.8*
> -%{_mandir}/man8/ovs-pki.8*
> -%{_mandir}/man8/ovs-vsctl.8*
> -%{_mandir}/man8/ovs-vswitchd.8*
> -%{_mandir}/man8/ovs-parse-backtrace.8*
> -%{_mandir}/man8/ovs-testcontroller.8*
> -%if %{with dpdk}
> -%{_prefix}/lib/udev/rules.d/91-vfio.rules
> -%endif
> -%doc NOTICE README.rst NEWS rhel/README.RHEL.rst
> -/var/lib/openvswitch
> -%attr(750,root,root) /var/log/openvswitch
> -%ghost %attr(755,root,root) %{_rundir}/openvswitch
> -
> -%files ipsec
> -%{_datadir}/openvswitch/scripts/ovs-monitor-ipsec
> -%{_unitdir}/openvswitch-ipsec.service
> -
> -%changelog
> -* Wed Jan 12 2011 Ralf Spenneberg <ralf@os-s.net>
> -- First build on F14
> diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in
> deleted file mode 100644
> index 9a4c48910..000000000
> --- a/rhel/openvswitch-kmod-fedora.spec.in
> +++ /dev/null
> @@ -1,134 +0,0 @@
> -# Spec file for Open vSwitch.
> -
> -# Copyright (C) 2009, 2010, 2015, 2018 Nicira Networks, Inc.
> -#
> -# Copying and distribution of this file, with or without modification,
> -# are permitted in any medium without royalty provided the copyright
> -# notice and this notice are preserved.  This file is offered as-is,
> -# without warranty of any kind.
> -
> -%global debug_package %{nil}
> -
> -# Use the kversion macro such as
> -# RPMBUILD_OPT='-D "kversion 3.10.0-693.1.1.el7.x86_64 3.10.0-693.17.1.el7.x86_64"'
> -# to build package for mulitple kernel versions in the same package
> -# This only works for kernel 3.10.0 major revision 693 (RHEL 7.4)
> -# and major revision 327 (RHEL 7.2)
> -# By default, build against the current running kernel version
> -#%define kernel 3.1.5-1.fc16.x86_64
> -#define kernel %{kernel_source}
> -%{?kversion:%define kernel %kversion}
> -
> -Name: openvswitch-kmod
> -Summary: Open vSwitch Kernel Modules
> -Group: System Environment/Daemons
> -URL: http://www.openvswitch.org/
> -Vendor: OpenSource Security Ralf Spenneberg <ralf@os-s.net>
> -Version: @VERSION@
> -
> -# The entire source code is ASL 2.0 except datapath/ which is GPLv2
> -License: GPLv2
> -Release: 1%{?dist}
> -Source: openvswitch-%{version}.tar.gz
> -#Source1: openvswitch-init
> -Buildroot: /tmp/openvswitch-xen-rpm
> -Provides: kmod-openvswitch
> -Obsoletes: kmod-openvswitch < %{version}-%{release}
> -
> -%description
> -Open vSwitch provides standard network bridging functions augmented with
> -support for the OpenFlow protocol for remote per-flow control of
> -traffic. This package contains the kernel modules.
> -
> -%prep
> -%setup -q -n openvswitch-%{version}
> -
> -%build
> -for kv in %{kversion}; do
> -    mkdir -p _$kv
> -    (cd _$kv && /bin/cp -f ../configure . && %configure --srcdir=.. \
> -        --with-linux=/lib/modules/${kv}/build --enable-ssl %{_ovs_config_extra_flags})
> -    make %{_smp_mflags} -C _$kv/datapath/linux
> -done
> -
> -%install
> -export INSTALL_MOD_DIR=extra/openvswitch
> -rm -rf $RPM_BUILD_ROOT
> -for kv in %{kversion}; do
> -    make INSTALL_MOD_PATH=$RPM_BUILD_ROOT -C _$kv/datapath/linux modules_install
> -done
> -mkdir -p $RPM_BUILD_ROOT/etc/depmod.d
> -for kv in %{kversion}; do
> -    for module in $RPM_BUILD_ROOT/lib/modules/${kv}/extra/openvswitch/*.ko
> -    do
> -        modname="$(basename ${module})"
> -        grep -qsPo "^\s*override ${modname%.ko} \* extra\/openvwitch" \
> -            $RPM_BUILD_ROOT/etc/depmod.d/kmod-openvswitch.conf || \
> -            echo "override ${modname%.ko} * extra/openvswitch" >> \
> -            $RPM_BUILD_ROOT/etc/depmod.d/kmod-openvswitch.conf
> -        grep -qsPo "^\s*override ${modname%.ko} \* weak-updates\/openvwitch" \
> -            $RPM_BUILD_ROOT/etc/depmod.d/kmod-openvswitch.conf || \
> -            echo "override ${modname%.ko} * weak-updates/openvswitch" >> \
> -            $RPM_BUILD_ROOT/etc/depmod.d/kmod-openvswitch.conf
> -    done
> -done
> -install -d -m 0755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
> -install -p -m 0755 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh \
> -    $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh
> -
> -%clean
> -rm -rf $RPM_BUILD_ROOT
> -
> -%post
> -current_kernel=$(uname -r)
> -IFS='.\|-' read mainline_major mainline_minor mainline_patch major_rev \
> -    minor_rev _extra <<<"${current_kernel}"
> -# echo mainline_major=$mainline_major mainline_minor=$mainline_minor \
> -# mainline_patch=$mainline_patch major_rev=$major_rev minor_rev=$minor_rev
> -if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then
> -    if [ "$major_rev" = "327" ] || [ "$major_rev" = "693" ]; then
> -        # For RHEL 7.2 and 7.4
> -        if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then
> -            %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh
> -        fi
> -    fi
> -elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "4" ] && \
> -     [ "$mainline_patch" -ge "73" ]; then
> -     # For SLES 12 SP3
> -     if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then
> -         %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh
> -     fi
> -else
> -    # Ensure that modprobe will find our modules.
> -    for k in $(cd /lib/modules && /bin/ls); do
> -        [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k"
> -    done
> -    if [ -x "/sbin/weak-modules" ]; then
> -        for m in openvswitch vport-gre vport-stt vport-geneve \
> -                 vport-lisp vport-vxlan; do
> -            echo "/lib/modules/%{kernel}/extra/openvswitch/$m.ko"
> -        done | /sbin/weak-modules --add-modules
> -    fi
> -fi
> -
> -%postun
> -if [ "$1" = 0 ]; then  # Erase, not upgrade
> -    for kname in `ls -d /lib/modules/*`
> -do
> -    rm -rf $kname/weak-updates/openvswitch
> -done
> -fi
> -/sbin/depmod -a
> -
> -%files
> -%defattr(0644,root,root)
> -/lib/modules/*/extra/openvswitch/*.ko
> -/etc/depmod.d/kmod-openvswitch.conf
> -%exclude /lib/modules/*/modules.*
> -%attr(755,root,root) %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh
> -
> -%changelog
> -* Wed Sep 21 2011 Kyle Mestery <kmestery@cisco.com>
> -- Updated for F15
> -* Wed Jan 12 2011 Ralf Spenneberg <ralf@os-s.net>
> -- First build on F14
> diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in
> deleted file mode 100644
> index c8361f5f2..000000000
> --- a/rhel/openvswitch.spec.in
> +++ /dev/null
> @@ -1,282 +0,0 @@
> -# Spec file for Open vSwitch on Red Hat Enterprise Linux.
> -
> -# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
> -#
> -# Copying and distribution of this file, with or without modification,
> -# are permitted in any medium without royalty provided the copyright
> -# notice and this notice are preserved.  This file is offered as-is,
> -# without warranty of any kind.
> -#
> -# If tests have to be skipped while building, specify the '--without check'
> -# option. For example:
> -#     rpmbuild -bb --without check rhel/openvswitch.spec
> -#
> -# Support for executing kernel data path tests under rpmbuild is
> -# provided, however this is intended for use only in test environments
> -# and should not be used otherwise (these tests require root privileges).
> -# These tests can be executed, for example, via:
> -#    rpmbuild -rb --with check_datapath_kernel openvswitch.src.rpm
> -#
> -# These tests will use the currently installed OVS kernel modules, when
> -# testing out of tree kernel modules the appropriate openvswitch-kmod
> -# package should be installed first.
> -
> -Name: openvswitch
> -Summary: Open vSwitch daemon/database/utilities
> -Group: System Environment/Daemons
> -URL: http://www.openvswitch.org/
> -Vendor: Nicira, Inc.
> -Version: @VERSION@
> -
> -License: ASL 2.0
> -Release: 1
> -Source: openvswitch-%{version}.tar.gz
> -Buildroot: /tmp/openvswitch-rpm
> -Requires: logrotate, hostname, python >= 2.7, python-six
> -BuildRequires: python-six
> -BuildRequires: openssl-devel
> -BuildRequires: checkpolicy, selinux-policy-devel
> -BuildRequires: autoconf, automake, libtool
> -BuildRequires: python-sphinx
> -BuildRequires: unbound-devel
> -
> -%bcond_without check
> -%bcond_with check_datapath_kernel
> -
> -%description
> -Open vSwitch provides standard network bridging functions and
> -support for the OpenFlow protocol for remote per-flow control of
> -traffic.
> -
> -%package devel
> -Summary:        Open vSwitch development package
> -Group:          Development/Libraries
> -
> -%description devel
> -This package provides openvswitch headers and libopenvswitch for developers.
> -
> -%package selinux-policy
> -Summary: Open vSwitch SELinux policy
> -License: ASL 2.0
> -BuildArch: noarch
> -Requires: selinux-policy-targeted
> -
> -%description selinux-policy
> -Tailored Open vSwitch SELinux policy
> -
> -%prep
> -%setup -q
> -
> -%build
> -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} \
> -    --libdir=%{_libdir} --enable-ssl --enable-shared
> -make %{_smp_mflags}
> -make selinux-policy
> -
> -%install
> -rm -rf $RPM_BUILD_ROOT
> -make install DESTDIR=$RPM_BUILD_ROOT
> -
> -rhel_cp() {
> - base=$1
> - mode=$2
> - dst=$RPM_BUILD_ROOT/$(echo $base | sed 's,_,/,g')
> - install -D -m $mode rhel/$base $dst
> -}
> -rhel_cp etc_init.d_openvswitch 0755
> -rhel_cp etc_logrotate.d_openvswitch 0644
> -rhel_cp etc_sysconfig_network-scripts_ifup-ovs 0755
> -rhel_cp etc_sysconfig_network-scripts_ifdown-ovs 0755
> -rhel_cp usr_share_openvswitch_scripts_sysconfig.template 0644
> -
> -install -p -m 644 -D selinux/openvswitch-custom.pp \
> -    $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
> -
> -# Get rid of stuff we don't want to make RPM happy.
> -rm \
> -    $RPM_BUILD_ROOT/usr/bin/ovs-testcontroller \
> -    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-testcontroller.8 \
> -    $RPM_BUILD_ROOT/usr/bin/ovs-test \
> -    $RPM_BUILD_ROOT/usr/bin/ovs-l3ping \
> -    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 \
> -    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-l3ping.8 \
> -    $RPM_BUILD_ROOT/usr/sbin/ovs-vlan-bug-workaround \
> -    $RPM_BUILD_ROOT/usr/share/man/man8/ovs-vlan-bug-workaround.8 \
> -    $RPM_BUILD_ROOT/usr/bin/ovn-* \
> -    $RPM_BUILD_ROOT/usr/share/man/man?/ovn-* \
> -    $RPM_BUILD_ROOT/usr/share/openvswitch/ovn-* \
> -    $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn*
> -(cd "$RPM_BUILD_ROOT" && rm -rf usr/%{_lib}/*.la)
> -(cd "$RPM_BUILD_ROOT" && rm -rf usr/include)
> -
> -install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch
> -install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch
> -install -d -m 0755 $RPM_BUILD_ROOT/var/lib/openvswitch
> -
> -copy_headers() {
> -    src=$1
> -    dst=$RPM_BUILD_ROOT/$2
> -    install -d -m 0755 $dst
> -    install -m 0644 $src/*.h $dst
> -}
> -copy_headers include %{_includedir}/openvswitch
> -copy_headers include/openflow %{_includedir}/openvswitch/openflow
> -copy_headers include/openvswitch %{_includedir}/openvswitch/openvswitch
> -copy_headers include/sparse %{_includedir}/openvswitch/sparse
> -copy_headers include/sparse/arpa %{_includedir}/openvswitch/sparse/arpa
> -copy_headers include/sparse/netinet %{_includedir}/openvswitch/sparse/netinet
> -copy_headers include/sparse/sys %{_includedir}/openvswitch/sparse/sys
> -copy_headers lib %{_includedir}/openvswitch/lib
> -
> -install -D -m 0644 lib/.libs/libopenvswitch.a \
> -    $RPM_BUILD_ROOT/%{_libdir}/libopenvswitch.a
> -
> -%check
> -%if %{with check}
> -    if make check TESTSUITEFLAGS='%{_smp_mflags}' RECHECK=yes; then :;
> -    else
> -        cat tests/testsuite.log
> -        exit 1
> -    fi
> -%endif
> -%if %{with check_datapath_kernel}
> -    if make check-kernel RECHECK=yes; then :;
> -    else
> -        cat tests/system-kmod-testsuite.log
> -        exit 1
> -    fi
> -%endif
> -
> -%clean
> -rm -rf $RPM_BUILD_ROOT
> -
> -%post
> -# Create default or update existing /etc/sysconfig/openvswitch.
> -SYSCONFIG=/etc/sysconfig/openvswitch
> -TEMPLATE=/usr/share/openvswitch/scripts/sysconfig.template
> -if [ ! -e $SYSCONFIG ]; then
> -    cp $TEMPLATE $SYSCONFIG
> -else
> -    for var in $(awk -F'[ :]' '/^# [_A-Z0-9]+:/{print $2}' $TEMPLATE)
> -    do
> -        if ! grep $var $SYSCONFIG >/dev/null 2>&1; then
> -            echo >> $SYSCONFIG
> -            sed -n "/$var:/,/$var=/p" $TEMPLATE >> $SYSCONFIG
> -        fi
> -    done
> -fi
> -
> -# Ensure all required services are set to run
> -/sbin/chkconfig --add openvswitch
> -/sbin/chkconfig openvswitch on
> -
> -%pre selinux-policy
> -%selinux_relabel_pre -s targeted
> -
> -%post selinux-policy
> -%selinux_modules_install -s targeted %{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
> -
> -%preun
> -if [ "$1" = "0" ]; then     # $1 = 0 for uninstall
> -    /sbin/service openvswitch stop
> -    /sbin/chkconfig --del openvswitch
> -fi
> -
> -%postun
> -if [ "$1" = "0" ]; then     # $1 = 0 for uninstall
> -    rm -f /etc/openvswitch/conf.db
> -    rm -f /etc/sysconfig/openvswitch
> -    rm -f /etc/openvswitch/vswitchd.cacert
> -fi
> -
> -%postun selinux-policy
> -if [ $1 -eq 0 ] ; then
> -  %selinux_modules_uninstall -s targeted openvswitch-custom
> -fi
> -
> -exit 0
> -
> -%posttrans selinux-policy
> -%selinux_relabel_post -s targeted
> -
> -%files
> -%defattr(-,root,root)
> -%dir /etc/openvswitch
> -/etc/bash_completion.d/ovs-appctl-bashcomp.bash
> -/etc/bash_completion.d/ovs-vsctl-bashcomp.bash
> -/etc/init.d/openvswitch
> -%config(noreplace) /etc/logrotate.d/openvswitch
> -/etc/sysconfig/network-scripts/ifup-ovs
> -/etc/sysconfig/network-scripts/ifdown-ovs
> -/usr/bin/ovs-appctl
> -/usr/bin/ovs-dpctl
> -/usr/bin/ovs-dpctl-top
> -/usr/bin/ovs-docker
> -/usr/bin/ovs-ofctl
> -/usr/bin/ovs-parse-backtrace
> -/usr/bin/ovs-pcap
> -/usr/bin/ovs-pki
> -/usr/bin/ovs-tcpdump
> -/usr/bin/ovs-tcpundump
> -/usr/bin/ovs-vlan-test
> -/usr/bin/ovs-vsctl
> -/usr/bin/ovsdb-client
> -/usr/bin/ovsdb-tool
> -/usr/bin/vtep-ctl
> -%{_libdir}/lib*.so.*
> -/usr/sbin/ovs-bugtool
> -/usr/sbin/ovs-vswitchd
> -/usr/sbin/ovsdb-server
> -/usr/share/man/man1/ovs-pcap.1.gz
> -/usr/share/man/man1/ovs-tcpundump.1.gz
> -/usr/share/man/man1/ovsdb-client.1.gz
> -/usr/share/man/man1/ovsdb-server.1.gz
> -/usr/share/man/man1/ovsdb-tool.1.gz
> -/usr/share/man/man5/ovsdb-server.5.gz
> -/usr/share/man/man5/ovs-vswitchd.conf.db.5.gz
> -%{_mandir}/man5/ovsdb.5*
> -/usr/share/man/man5/vtep.5.gz
> -/usr/share/man/man7/ovs-actions.7.gz
> -/usr/share/man/man7/ovs-fields.7.gz
> -%{_mandir}/man7/ovsdb.7*
> -%{_mandir}/man7/ovsdb-server.7*
> -/usr/share/man/man8/ovs-appctl.8.gz
> -/usr/share/man/man8/ovs-bugtool.8.gz
> -/usr/share/man/man8/ovs-ctl.8.gz
> -/usr/share/man/man8/ovs-dpctl.8.gz
> -/usr/share/man/man8/ovs-dpctl-top.8.gz
> -/usr/share/man/man8/ovs-kmod-ctl.8.gz
> -/usr/share/man/man8/ovs-ofctl.8.gz
> -/usr/share/man/man8/ovs-parse-backtrace.8.gz
> -/usr/share/man/man8/ovs-pki.8.gz
> -/usr/share/man/man8/ovs-tcpdump.8.gz
> -/usr/share/man/man8/ovs-vlan-test.8.gz
> -/usr/share/man/man8/ovs-vsctl.8.gz
> -/usr/share/man/man8/ovs-vswitchd.8.gz
> -/usr/share/man/man8/vtep-ctl.8.gz
> -/usr/share/openvswitch/bugtool-plugins/
> -/usr/share/openvswitch/python/
> -/usr/share/openvswitch/scripts/ovs-bugtool-*
> -/usr/share/openvswitch/scripts/ovs-check-dead-ifs
> -/usr/share/openvswitch/scripts/ovs-ctl
> -/usr/share/openvswitch/scripts/ovs-kmod-ctl
> -/usr/share/openvswitch/scripts/ovs-lib
> -/usr/share/openvswitch/scripts/ovs-save
> -/usr/share/openvswitch/scripts/ovs-vtep
> -/usr/share/openvswitch/scripts/sysconfig.template
> -/usr/share/openvswitch/scripts/ovs-monitor-ipsec
> -/usr/share/openvswitch/vswitch.ovsschema
> -/usr/share/openvswitch/vtep.ovsschema
> -%doc NOTICE README.rst NEWS rhel/README.RHEL.rst
> -/var/lib/openvswitch
> -/var/log/openvswitch
> -
> -%files devel
> -%{_libdir}/lib*.so
> -%{_libdir}/lib*.a
> -%{_libdir}/pkgconfig
> -%{_includedir}/openvswitch/*
> -
> -%files selinux-policy
> -%defattr(-,root,root)
> -%{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp
> diff --git a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
> deleted file mode 100644
> index d8f47af68..000000000
> --- a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -[Unit]
> -Description=OVS IPsec daemon
> -Requires=openvswitch.service
> -After=openvswitch.service
> -
> -[Service]
> -Type=forking
> -PIDFile=/var/run/openvswitch/ovs-monitor-ipsec.pid
> -ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
> -                    --ike-daemon=libreswan start-ovs-ipsec
> -ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop-ovs-ipsec
> -
> -[Install]
> -WantedBy=multi-user.target
> diff --git a/rhel/usr_lib_systemd_system_openvswitch.service b/rhel/usr_lib_systemd_system_openvswitch.service
> deleted file mode 100644
> index feaba37d5..000000000
> --- a/rhel/usr_lib_systemd_system_openvswitch.service
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -[Unit]
> -Description=Open vSwitch
> -Before=network.target network.service
> -After=network-pre.target ovsdb-server.service ovs-vswitchd.service
> -PartOf=network.target
> -Requires=ovsdb-server.service
> -Requires=ovs-vswitchd.service
> -
> -[Service]
> -Type=oneshot
> -ExecStart=/bin/true
> -ExecReload=/usr/share/openvswitch/scripts/ovs-systemd-reload
> -ExecStop=/bin/true
> -RemainAfterExit=yes
> -
> -[Install]
> -WantedBy=multi-user.target
> diff --git a/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service b/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service
> deleted file mode 100644
> index 4cd4d7f57..000000000
> --- a/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -[Unit]
> -Description=Open vSwitch Delete Transient Ports
> -After=ovsdb-server.service
> -Before=ovs-vswitchd.service
> -AssertPathExists=/var/run/openvswitch/db.sock
> -
> -[Service]
> -Type=oneshot
> -RemainAfterExit=yes
> -ExecStart=/usr/share/openvswitch/scripts/ovs-ctl delete-transient-ports
> diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
> deleted file mode 100644
> index edd76493c..000000000
> --- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -[Unit]
> -Description=Open vSwitch Forwarding Unit
> -After=ovsdb-server.service network-pre.target systemd-udev-settle.service
> -Before=network.target network.service
> -Requires=ovsdb-server.service
> -ReloadPropagatedFrom=ovsdb-server.service
> -AssertPathIsReadWrite=/var/run/openvswitch/db.sock
> -PartOf=openvswitch.service
> -
> -[Service]
> -Type=forking
> -PIDFile=/var/run/openvswitch/ovs-vswitchd.pid
> -Restart=on-failure
> -Environment=XDG_RUNTIME_DIR=/var/run/openvswitch
> -EnvironmentFile=/etc/openvswitch/default.conf
> -EnvironmentFile=-/etc/sysconfig/openvswitch
> -EnvironmentFile=-/run/openvswitch/useropts
> -LimitSTACK=2M
> -@begin_dpdk@
> -ExecStartPre=-/bin/sh -c '/usr/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages'
> -ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages
> -@end_dpdk@
> -ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
> -          --no-ovsdb-server --no-monitor --system-id=random \
> -          ${OVSUSER} \
> -          start $OPTIONS
> -ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop
> -ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \
> -          --no-monitor --system-id=random \
> -          ${OVSUSER} \
> -          restart $OPTIONS
> -TimeoutSec=300
> diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service
> deleted file mode 100644
> index 41ac2dded..000000000
> --- a/rhel/usr_lib_systemd_system_ovsdb-server.service
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -[Unit]
> -Description=Open vSwitch Database Unit
> -After=syslog.target network-pre.target
> -Before=network.target network.service
> -Wants=ovs-delete-transient-ports.service
> -PartOf=openvswitch.service
> -
> -[Service]
> -Type=forking
> -PIDFile=/var/run/openvswitch/ovsdb-server.pid
> -Restart=on-failure
> -EnvironmentFile=/etc/openvswitch/default.conf
> -EnvironmentFile=-/etc/sysconfig/openvswitch
> -ExecStartPre=/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
> -ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi'
> -EnvironmentFile=-/run/openvswitch/useropts
> -ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
> -          --no-ovs-vswitchd --no-monitor --system-id=random \
> -          ${OVSUSER} \
> -          start $OPTIONS
> -ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop
> -ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \
> -           ${OVSUSER} \
> -           --no-monitor restart $OPTIONS
> -RuntimeDirectory=openvswitch
> -RuntimeDirectoryMode=0755
> diff --git a/rhel/usr_lib_udev_rules.d_91-vfio.rules b/rhel/usr_lib_udev_rules.d_91-vfio.rules
> deleted file mode 100644
> index 8e34b2a2b..000000000
> --- a/rhel/usr_lib_udev_rules.d_91-vfio.rules
> +++ /dev/null
> @@ -1 +0,0 @@
> -ACTION=="add", SUBSYSTEM=="vfio*", GROUP="hugetlbfs", MODE="0660"
> diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
> deleted file mode 100644
> index b5c4615f2..000000000
> --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
> +++ /dev/null
> @@ -1,160 +0,0 @@
> -#!/bin/sh
> -
> -# Copyright (c) 2018 Nicira/VMware, Inc.
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#     http://www.apache.org/licenses/LICENSE-2.0
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -
> -# This version of the script is intended to be used on kernel version 3.10.0
> -# major revision 327 (RHEL 7.2) and 693 (RHEL 7.4), and kernel version 4.4.x,
> -# x >= 73 (SLES 12 SP3) only. It is packaged in the openvswitch kmod RPM
> -# and run in the post-install scripts.
> -#
> -# For kernel 3.10.0-693,
> -# due to some backward incompatible changes introduced in minor revision 17.1,
> -# kernel modules built against kernels newer than 17.1 cannot be loaded on
> -# system running kernels older than 17.1, vice versa.
> -#
> -# For kernel 3.10.0-327,
> -# due to some backward incompatible changes introduced in minor revision 41.3,
> -# kernel modules built against kernels newer than 41.3 cannot be loaded on
> -# system running kernels older than 41.3, vice versa.
> -#
> -# For kernel >= 4.4.73,
> -# kernel modules built with 4.4.73 can run on systems with kernel versions from
> -# 4.4.73 to 4.4.114; modules built against 4.4.120 can run on systems from
> -# 4.4.120 onwards.
> -#
> -# This script checks the current running kernel version, and update symlinks
> -# for the openvswitch kernel modules in the appropriate kernel directory,
> -# provided the kmod RPM has installed kernel modules files built from both
> -# minor revisions.
> -#
> -# In case of a kernel minor revision change after the openvswitch kmod package
> -# is installed, this script shall be run manually after system reboots and
> -# switches to a different kernel
> -if [ -n "$(rpm -qa kmod-openvswitch)" ]; then
> -    rpmname="kmod-openvswitch"
> -elif [ -n "$(rpm -qa openvswitch-kmod)" ]; then
> -    rpmname="openvswitch-kmod"
> -else
> -    echo "openvswitch kmod package not installed, existing"
> -    exit 1
> -fi
> -#echo $rpmname
> -script_name=$(basename -- "$0")
> -current_kernel=$(uname -r)
> -echo current kernel is $current_kernel
> -
> -IFS='.\|-' read mainline_major mainline_minor mainline_patch major_rev \
> -    minor_rev _extra <<<"${current_kernel}"
> -# echo mainline_major=$mainline_major mainline_minor=$mainline_minor \
> -# mainline_patch=$mainline_patch major_rev=$major_rev minor_rev=$minor_rev
> -
> -expected_rhel_base_minor="el7"
> -if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then
> -    if [ "$major_rev" = "327" ]; then
> -#        echo "rhel72"
> -        comp_ver=36
> -        ver_offset=4
> -        installed_ver="$minor_rev"
> -    elif [ "$major_rev" = "693" ]; then
> -#        echo "rhel74"
> -        comp_ver=11
> -        ver_offset=4
> -        installed_ver="$minor_rev"
> -    fi
> -elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "4" ]; then
> -    if [ "$mainline_patch" -ge "73" ]; then
> -#        echo "sles12sp3"
> -        comp_ver=114
> -        ver_offset=2
> -        installed_ver="$mainline_patch"
> -    fi
> -fi
> -
> -if [ X"$ver_offset" = X ]; then
> -    echo "This script is not intended to run on kernel $(uname -r)"
> -    exit 1
> -fi
> -
> -#IFS='.\|-' read -r -a version_nums <<<"${current_kernel}"
> -#echo ver_offset=$ver_offset
> -#echo installed_ver="$installed_ver"
> -#echo installed_ver="${version_nums[$ver_offset]}"
> -
> -kmod_versions=()
> -kversion=$(rpm -ql ${rpmname} | grep '\.ko$' | \
> -           sed -n -e 's/^\/lib\/modules\/\(.*\)\/extra\/.*$/\1/p' | \
> -           sort | uniq)
> -for kv in $kversion; do
> -    IFS='.\|-' read -r -a kv_nums <<<"${kv}"
> -    kmod_versions+=(${kv_nums[$ver_offset]})
> -done
> -sorted_kmod_vers=$(printf "%s\n" "${kmod_versions[@]}" | \
> -                       sort -n)
> -#echo "$sorted_kmod_vers"
> -
> -if [ ! -n "$sorted_kmod_vers" ]; then
> -    echo "No kernel modules found from package $rpmname, exiting"
> -    exit 1
> -else
> -    # first line for kmod_low_ver, last for kmod_high_ver
> -    kmod_low_ver=$(echo "$sorted_kmod_vers" | head -1)
> -    kmod_high_ver=$(echo "$sorted_kmod_vers" | tail -1)
> -fi
> -#echo "Installing KMOD with minor revisions $kmod_low_ver and \
> -#$kmod_high_ver"
> -
> -found_match=false
> -for kname in `ls -d /lib/modules/*`
> -do
> -    IFS='.\|-' read -r -a pkg_ver_nums <<<"${kname}"
> -    pkg_ver=${pkg_ver_nums[$ver_offset]}
> -    if [ "$installed_ver" = "$expected_rhel_base_minor" ] ||
> -       [ "$installed_ver" -le "$comp_ver" ]; then
> -        if [ "$pkg_ver" = "$kmod_low_ver" ]; then
> -            requested_kernel=$kname
> -            found_match="true"
> -            echo "Installing Openvswitch KMOD from kernel $kname"
> -            break
> -        fi
> -    else
> -        if [ "$pkg_ver" = "$kmod_high_ver" ]; then
> -            requested_kernel=$kname
> -            found_match="true"
> -            echo "Installing Openvswitch KMOD from kernel $kname"
> -            break
> -        fi
> -    fi
> -done
> -
> -if [ "$found_match" = "false" ]; then
> -    echo $script_name: Failed
> -    exit 1
> -fi
> -
> -if [ "$requested_kernel" != "/lib/modules/$current_kernel" ]; then
> -    if [ ! -d /lib/modules/$current_kernel/weak-updates/openvswitch ]; then
> -        mkdir -p /lib/modules/$current_kernel/weak-updates
> -        mkdir -p /lib/modules/$current_kernel/weak-updates/openvswitch
> -    fi
> -    for m in openvswitch vport-gre vport-stt vport-geneve \
> -        vport-lisp vport-vxlan; do
> -        ln -f -s $requested_kernel/extra/openvswitch/$m.ko \
> -            /lib/modules/$current_kernel/weak-updates/openvswitch/$m.ko
> -    done
> -else
> -    echo Proper OVS kernel modules already configured
> -fi
> -# Always run depmod
> -/sbin/depmod -a
> diff --git a/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload b/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload
> deleted file mode 100755
> index 894df0427..000000000
> --- a/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -#! /bin/sh
> -
> -# Copyright (c) 2017 Red Hat, Inc.
> -#
> -# Licensed under the Apache License, Version 2.0 (the "License");
> -# you may not use this file except in compliance with the License.
> -# You may obtain a copy of the License at:
> -#
> -#     http://www.apache.org/licenses/LICENSE-2.0
> -#
> -# Unless required by applicable law or agreed to in writing, software
> -# distributed under the License is distributed on an "AS IS" BASIS,
> -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> -# See the License for the specific language governing permissions and
> -# limitations under the License.
> -
> -case $0 in
> -    */*) dir0=`echo "$0" | sed 's,/[^/]*$,,'` ;;
> -    *) dir0=./ ;;
> -esac
> -. "$dir0/ovs-lib" || exit 1
> -
> -stop_ovsdb() {
> -    systemctl --job-mode=ignore-dependencies stop ovsdb-server
> -}
> -
> -start_ovsdb() {
> -    systemctl --job-mode=ignore-dependencies start ovsdb-server
> -}
> -
> -stop_forwarding() {
> -    systemctl --job-mode=ignore-dependencies stop ovs-vswitchd
> -}
> -
> -start_forwarding() {
> -    systemctl --job-mode=ignore-dependencies start ovs-vswitchd
> -}
> -
> -add_managers() {
> -    :
> -}
> -
> -if [ "$1" = "force-reload-kmod" ]; then
> -    force_reload_kmod
> -else
> -    restart
> -fi
> -
> -exit 0
> diff --git a/rhel/usr_share_openvswitch_scripts_sysconfig.template b/rhel/usr_share_openvswitch_scripts_sysconfig.template
> deleted file mode 100644
> index 2c0845296..000000000
> --- a/rhel/usr_share_openvswitch_scripts_sysconfig.template
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -### Configuration options for openvswitch
> -
> -# Copyright (C) 2009, 2010, 2011 Nicira, Inc.
> -
> -# FORCE_COREFILES: If 'yes' then core files will be enabled.
> -# FORCE_COREFILES=yes
> -
> -# OVSDB_SERVER_PRIORITY: "nice" priority at which to run ovsdb-server.
> -#
> -# OVSDB_SERVER_PRIORITY=-10
> -
> -# VSWITCHD_PRIORITY: "nice" priority at which to run ovs-vswitchd.
> -# VSWITCHD_PRIORITY=-10
> -
> -# VSWITCHD_MLOCKALL: Whether to pass ovs-vswitchd the --mlockall option.
> -#     This option should be set to "yes" or "no".  The default is "yes".
> -#     Enabling this option can avoid networking interruptions due to
> -#     system memory pressure in extraordinary situations, such as multiple
> -#     concurrent VM import operations.
> -# VSWITCHD_MLOCKALL=yes
> -
> -# OVS_CTL_OPTS: Extra options to pass to ovs-ctl.  This is, for example,
> -# a suitable place to specify --ovs-vswitchd-wrapper=valgrind.
> -# OVS_CTL_OPTS=
> diff --git a/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template b/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template
> deleted file mode 100644
> index c467d02db..000000000
> --- a/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -### Configuration options for openvswitch
> -#
> -# Enable core files.
> -# This option should be set to "yes" or "no".  The default is "yes".
> -# --force-corefiles=yes
> -#
> -# Set "nice" priority at which to run ovsdb-server:
> -# --ovsdb-server-priority=-10
> -#
> -# Set "nice" priority at which to run ovsdb-vswitchd:
> -# --ovs-vswitchd-priority=-10
> -#
> -# Pass or not --mlockall option to ovs-vswitchd.
> -# This option should be set to "yes" or "no".  The default is "yes".
> -# Enabling this option can avoid networking interruptions due to
> -# system memory pressure in extraordinary situations, such as multiple
> -# concurrent VM import operations.
> -# --mlockall=yes
> -#
> -# Use valgrind:
> -#   --ovs-vswitchd-wrapper=valgrind
> -#   --ovsdb-server-wrapper=valgrind
> -#
> -# Specify additional options, for example to start with debug logs:
> -#   --ovs-vswitchd-options='-vconsole:dbg -vfile:dbg'
> -#   --ovsdb-server-options='-vconsole:dbg -vfile:dbg'
> -#
> -OPTIONS=""
> -
> -# Uncomment and set the OVS User/Group value
> -#OVS_USER_ID="openvswitch:openvswitch"
> --
> 2.21.0
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

On Thu, Jun 13, 2019 at 10:23 PM Ben Pfaff <blp@ovn.org> wrote:

> On Wed, Jun 12, 2019 at 12:49:32PM +0530, nusiddiq@redhat.com wrote:
> > From: Numan Siddique <nusiddiq@redhat.com>
> >
> > The patch renames the make target - 'rpm-fedora-ovn' to 'rpm-fedora'
> >
> > Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
>
> I didn't read all of this one, so the following Ack is merely that I
> approve the concept described in the commit message.  You can decide
> that you're comfortable with this or that you want another reviewer:
> Acked-by: Ben Pfaff <blp@ovn.org>
>

Thanks Ben and Lorenzo for the review and testing. I pushed the patch to
master.

Numan