X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rhel%2Fopenvswitch-kmod-rhel5.spec.in;h=ae73ea6ce8fbb78c763bae0b76a70754a89df269;hb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;hp=f1bc02efd700bbc5c813c9b07c0d76e58150afe1;hpb=c434706a374bd44d1274e7bdbee40067a6620b61;p=sliver-openvswitch.git diff --git a/rhel/openvswitch-kmod-rhel5.spec.in b/rhel/openvswitch-kmod-rhel5.spec.in index f1bc02efd..ae73ea6ce 100644 --- a/rhel/openvswitch-kmod-rhel5.spec.in +++ b/rhel/openvswitch-kmod-rhel5.spec.in @@ -1,7 +1,7 @@ # Spec file for Open vSwitch kernel modules on Red Hat Enterprise # Linux 5. -# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc. +# 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 @@ -63,8 +63,8 @@ echo "override %{kmod_name} * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.con for kvariant in %{kvariants} ; do KSRC=%{_usrsrc}/kernels/%{kversion}${kvariant:+-$kvariant}-%{_target_cpu} cd _kmod_build_$kvariant - ../openvswitch-%{version}/configure --with-l26="$KSRC" - %{__make} -C datapath/linux-2.6 %{?_smp_mflags} + ../openvswitch-%{version}/configure --with-linux="$KSRC" + %{__make} -C datapath/linux %{?_smp_mflags} cd .. done @@ -74,7 +74,7 @@ export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=extra/%{kmod_name} for kvariant in %{kvariants} ; do KSRC=%{_usrsrc}/kernels/%{kversion}${kvariant:+-$kvariant}-%{_target_cpu} - %{__make} -C "${KSRC}" modules_install M=$PWD/_kmod_build_$kvariant/datapath/linux-2.6 + %{__make} -C "${KSRC}" modules_install M="`pwd`"/_kmod_build_$kvariant/datapath/linux done %{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/ %{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/