On 1/28/16 10:27 AM, Guru Shetty wrote:


On 28 January 2016 at 05:48, Thomas F Herbert <[email protected] <mailto:[email protected]>> wrote:

    Signed-off-by: Thomas F Herbert <[email protected]
    <mailto:[email protected]>>


The changes that this commit reverts were initially added as part of commit 9c12d2ec7569a12d9.
So this commit will break the original fix.
I found this building the kmod on Centos 7 and the file openvswitch.conf doesn't actually exist. Do Rhel 6 builds of the out-of-tree kmod still work?

    ---
     rhel/openvswitch-kmod-rhel6.spec.in
    <http://openvswitch-kmod-rhel6.spec.in> | 2 --
     rhel/openvswitch-kmod.files         | 3 ---
     2 files changed, 5 deletions(-)
     delete mode 100644 rhel/openvswitch-kmod.files

    diff --git a/rhel/openvswitch-kmod-rhel6.spec.in
    <http://openvswitch-kmod-rhel6.spec.in>
    b/rhel/openvswitch-kmod-rhel6.spec.in
    <http://openvswitch-kmod-rhel6.spec.in>
    index 5d46838..6bd58f4 100644
    --- a/rhel/openvswitch-kmod-rhel6.spec.in
    <http://openvswitch-kmod-rhel6.spec.in>
    +++ b/rhel/openvswitch-kmod-rhel6.spec.in
    <http://openvswitch-kmod-rhel6.spec.in>
    @@ -19,7 +19,6 @@ Group:          System/Kernel
     License:        GPLv2
     URL: http://openvswitch.org/
     Source0:        %{oname}-%{version}.tar.gz
    -Source1:        %{oname}-kmod.files
     BuildRoot:      %(mktemp -ud
    %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
     BuildRequires:  %kernel_module_package_buildreqs

    @@ -66,7 +65,6 @@ for flavor in %flavors_to_build ; do
              find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*'
    -exec rm {} \;
     done
     install -d %{buildroot}%{_sysconfdir}/depmod.d/
    -install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/

     %clean
     rm -rf $RPM_BUILD_ROOT
    diff --git a/rhel/openvswitch-kmod.files b/rhel/openvswitch-kmod.files
    deleted file mode 100644
    index 357c2e8..0000000
    --- a/rhel/openvswitch-kmod.files
    +++ /dev/null
    @@ -1,3 +0,0 @@
    -%defattr(644,root,root,755)
    -/lib/modules/%2-%1
    -/etc/depmod.d/openvswitch.conf
    --
    2.5.0

    _______________________________________________
    dev mailing list
    [email protected] <mailto:[email protected]>
    http://openvswitch.org/mailman/listinfo/dev



_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev

Reply via email to