git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Verify updates in ovs-xapi-sync.
[sliver-openvswitch.git]
/
xenserver
/
openvswitch-xen.spec.in
diff --git
a/xenserver/openvswitch-xen.spec.in
b/xenserver/openvswitch-xen.spec.in
index
7ab5af8
..
8c9d168
100644
(file)
--- a/
xenserver/openvswitch-xen.spec.in
+++ b/
xenserver/openvswitch-xen.spec.in
@@
-8,15
+8,14
@@
# without warranty of any kind.
# When building, the rpmbuild command line should define
# without warranty of any kind.
# When building, the rpmbuild command line should define
-# openvswitch_version, kernel_name, kernel_version,
kernel_flavor,
-#
and build_number
using -D arguments.
+# openvswitch_version, kernel_name, kernel_version,
and kernel_flavor
+# using -D arguments.
# for example:
#
# rpmbuild -D "openvswitch_version 1.1.0+build123"
# -D "kernel_name NAME-xen"
# -D "kernel_version 2.6.32.12-0.7.1.xs5.6.100.323.170596"
# -D "kernel_flavor xen"
# for example:
#
# rpmbuild -D "openvswitch_version 1.1.0+build123"
# -D "kernel_name NAME-xen"
# -D "kernel_version 2.6.32.12-0.7.1.xs5.6.100.323.170596"
# -D "kernel_flavor xen"
-# -D "build_number --with-build-number=123"
# -bb /usr/src/redhat/SPECS/openvswitch-xen.spec
%if %{?openvswitch_version:0}%{!?openvswitch_version:1}
# -bb /usr/src/redhat/SPECS/openvswitch-xen.spec
%if %{?openvswitch_version:0}%{!?openvswitch_version:1}
@@
-49,7
+48,7
@@
License: ASL 2.0
Release: 1
Source: openvswitch-%{openvswitch_version}.tar.gz
Buildroot: /tmp/openvswitch-xen-rpm
Release: 1
Source: openvswitch-%{openvswitch_version}.tar.gz
Buildroot: /tmp/openvswitch-xen-rpm
-Requires: openvswitch
_mod
.ko.%{module_abi_version}
+Requires: openvswitch.ko.%{module_abi_version}
%description
Open vSwitch provides standard network bridging functions augmented with
%description
Open vSwitch provides standard network bridging functions augmented with
@@
-60,7
+59,7
@@
traffic.
Summary: Open vSwitch kernel module
Group: System Environment/Kernel
License: GPLv2
Summary: Open vSwitch kernel module
Group: System Environment/Kernel
License: GPLv2
-Provides: %{name}-modules-%{kernel_flavor} = %{kernel_version}, openvswitch
_mod
.ko.%{module_abi_version}
+Provides: %{name}-modules-%{kernel_flavor} = %{kernel_version}, openvswitch.ko.%{module_abi_version}
Requires: kernel-%{kernel_name} = %{kernel_version}
%description %{module_package}
Requires: kernel-%{kernel_name} = %{kernel_version}
%description %{module_package}
@@
-71,7
+70,7
@@
Open vSwitch Linux kernel module compiled against kernel version
%setup -q -n openvswitch-%{openvswitch_version}
%build
%setup -q -n openvswitch-%{openvswitch_version}
%build
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-linux=/lib/modules/%{xen_version}/build --enable-ssl
%{?build_number}
+./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-linux=/lib/modules/%{xen_version}/build --enable-ssl
make %{_smp_mflags}
%install
make %{_smp_mflags}
%install
@@
-448,5
+447,5
@@
exit 0
%exclude /usr/share/openvswitch/python/ovs/db/*.py[co]
%files %{module_package}
%exclude /usr/share/openvswitch/python/ovs/db/*.py[co]
%files %{module_package}
-/lib/modules/%{xen_version}/extra/openvswitch/openvswitch
_mod
.ko
-%exclude /lib/modules/%{xen_version}/extra/openvswitch/brcompat
_mod
.ko
+/lib/modules/%{xen_version}/extra/openvswitch/openvswitch.ko
+%exclude /lib/modules/%{xen_version}/extra/openvswitch/brcompat.ko