From: Pravin B Shelar Date: Tue, 3 Sep 2013 17:55:18 +0000 (-0700) Subject: datapath: Drop support for RHEL5 build X-Git-Tag: sliver-openvswitch-2.0.90-1~16^2~11 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=207941eb669653675b66da5f442fe9e0d8919220 datapath: Drop support for RHEL5 build RHEL5 is based on kernel 2.6.18. Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- diff --git a/INSTALL.RHEL b/INSTALL.RHEL index a698faece..cbb91deaf 100644 --- a/INSTALL.RHEL +++ b/INSTALL.RHEL @@ -68,24 +68,7 @@ RHEL. On RHEL 5, the default RPM source directory is then the kernel-devel package is missing or buggy. Go back to step 1 or 2 and fix the problem. -7a. On RHEL 5, to build the Open vSwitch kernel module, copy - rhel/kmodtool-openvswitch-el5.sh into the RPM source directory and - run: - - rpmbuild -bb --target=i686-unknown-linux \ - rhel/openvswitch-kmod-rhel5.spec - - You might have to specify a kernel version, e.g.: - - rpmbuild -bb -D "kversion 2.6.18-238.12.1.el5" \ - --target=i686-unknown-linux \ - rhel/openvswitch-kmod-rhel5.spec - - This produces a "kmod-openvswitch" RPM for each kernel variant, - which is usually: "kmod-openvswitch", "kmod-openvswitch-xen", and - "kmod-openvswitch-PAE". - -7b. On RHEL 6, to build the Open vSwitch kernel module, copy +7. On RHEL 6, to build the Open vSwitch kernel module, copy rhel/openvswitch-kmod.files into the RPM source directory and run: rpmbuild -bb rhel/openvswitch-kmod-rhel6.spec diff --git a/rhel/automake.mk b/rhel/automake.mk index 7bc852090..2911e719e 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -12,9 +12,6 @@ EXTRA_DIST += \ rhel/etc_logrotate.d_openvswitch \ rhel/etc_sysconfig_network-scripts_ifdown-ovs \ rhel/etc_sysconfig_network-scripts_ifup-ovs \ - rhel/kmodtool-openvswitch-el5.sh \ - rhel/openvswitch-kmod-rhel5.spec \ - rhel/openvswitch-kmod-rhel5.spec.in \ rhel/openvswitch-kmod-rhel6.spec \ rhel/openvswitch-kmod-rhel6.spec.in \ rhel/openvswitch-kmod.files \ @@ -32,9 +29,6 @@ update_rhel_spec = \ < $(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-kmod-rhel5.spec: rhel/openvswitch-kmod-rhel5.spec.in $(top_builddir)/config.status - $(update_rhel_spec) - $(srcdir)/rhel/openvswitch-kmod-rhel6.spec: rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status $(update_rhel_spec) diff --git a/rhel/kmodtool-openvswitch-el5.sh b/rhel/kmodtool-openvswitch-el5.sh deleted file mode 100755 index ce1d54a65..000000000 --- a/rhel/kmodtool-openvswitch-el5.sh +++ /dev/null @@ -1,273 +0,0 @@ -#!/bin/bash - -# kmodtool - Helper script for building kernel module RPMs -# Copyright (c) 2003-2008 Ville Skyttä , -# Thorsten Leemhuis -# Jon Masters -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -shopt -s extglob - -myprog="kmodtool" -myver="0.10.10_kmp3" -knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)|xen) -kmod_name= -kver= -verrel= -variant= -kmp= - -get_verrel () -{ - verrel=${1:-$(uname -r)} - verrel=${verrel%%$knownvariants} -} - -print_verrel () -{ - get_verrel $@ - echo "${verrel}" -} - -get_variant () -{ - get_verrel $@ - variant=${1:-$(uname -r)} - variant=${variant##$verrel} - variant=${variant:-'""'} -} - -print_variant () -{ - get_variant $@ - echo "${variant}" -} - -get_rpmtemplate () -{ - local variant="${1}" - local dashvariant="${variant:+-${variant}}" - case "$verrel" in - *.el*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;; - *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;; - *) kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;; - esac - - echo "%package -n kmod-${kmod_name}${dashvariant}" - - if [ -z "$kmp_provides_summary" ]; then - echo "Summary: ${kmod_name} kernel module(s)" - fi - - if [ -z "$kmp_provides_group" ]; then - echo "Group: System Environment/Kernel" - fi - - if [ ! -z "$kmp_version" ]; then - echo "Version: %{kmp_version}" - fi - - if [ ! -z "$kmp_release" ]; then - echo "Release: %{kmp_release}" - fi - - if [ ! -z "$kmp" ]; then - echo "%global _use_internal_dependency_generator 0" - fi - - cat <= %{?epoch:%{epoch}:}%{version} -# - - cat < /dev/null || : -fi -EOF - - if [ ! -z "$kmp" ]; then - cat < /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules -EOF - - fi - - cat < /dev/null || : -EOF - - if [ ! -z "$kmp" ]; then - cat <&2 - exit 2 - elif [ -z "${kver}" ] ; then - echo "Please provide the kver as second parameter." >&2 - exit 2 - elif [ -z "${verrel}" ] ; then - echo "Couldn't find out the verrel." >&2 - exit 2 - fi - - for variant in "$@" ; do - if [ "default" == "$variant" ]; - then - get_rpmtemplate "" - else - get_rpmtemplate "${variant}" - fi - done -} - -usage () -{ - cat <