diff options
| author | Jesse Gross <jesse@nicira.com> | 2011-06-23 17:10:00 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2011-06-24 14:37:49 -0700 |
| commit | 22bcc0e70becd88bf895c44885d63704affe4284 (patch) | |
| tree | 4c29e6843c3972be5bced192a968217eb1c2190b /rhel | |
| parent | 8c7ea6a0c0d44f707eef136b77ac0dd1c55509a4 (diff) | |
datapath: Rename linux-2.6 and compat-2.6 directories.
The linux-2.6 and compat-2.6 directories apply equally to the upcoming
Linux 3.0 release, so this drops the 2.6 suffix and updates Makefiles.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'rhel')
| -rw-r--r-- | rhel/openvswitch-kmod-rhel5.spec.in | 4 | ||||
| -rw-r--r-- | rhel/openvswitch-kmod-rhel6.spec.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rhel/openvswitch-kmod-rhel5.spec.in b/rhel/openvswitch-kmod-rhel5.spec.in index cf2a077b..0f4ef32d 100644 --- a/rhel/openvswitch-kmod-rhel5.spec.in +++ b/rhel/openvswitch-kmod-rhel5.spec.in @@ -64,7 +64,7 @@ for kvariant in %{kvariants} ; do KSRC=%{_usrsrc}/kernels/%{kversion}${kvariant:+-$kvariant}-%{_target_cpu} cd _kmod_build_$kvariant ../openvswitch-%{version}/configure --with-linux="$KSRC" - %{__make} -C datapath/linux-2.6 %{?_smp_mflags} + %{__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/ diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in index 8f9b2efc..1d1955d6 100644 --- a/rhel/openvswitch-kmod-rhel6.spec.in +++ b/rhel/openvswitch-kmod-rhel6.spec.in @@ -41,7 +41,7 @@ Open vSwitch Linux kernel module. for flavor in %flavors_to_build; do mkdir _$flavor (cd _$flavor && ../configure --with-linux="%{kernel_source $flavor}") - %{__make} -C _$flavor/datapath/linux-2.6 %{?_smp_mflags} + %{__make} -C _$flavor/datapath/linux %{?_smp_mflags} done %install @@ -49,7 +49,7 @@ export INSTALL_MOD_PATH=$RPM_BUILD_ROOT export INSTALL_MOD_DIR=extra/%{name} for flavor in %flavors_to_build ; do make -C %{kernel_source $flavor} modules_install \ - M=$PWD/_$flavor/datapath/linux-2.6 + M=$PWD/_$flavor/datapath/linux done %clean |