No luck with this try.
rpmbuild failed again already on different definition:
/usr/bin/make -C /usr/src/kernels/2.6.32-358.0.1.el6.x86_64
M=/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/datapath/linux modules
make[1]: Entering directory `/usr/src/kernels/2.6.32-358.0.1.el6.x86_64'
CC [M]
/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/datapath/linux/genetlink-brcompat.o
CC [M]
/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/datapath/linux/brcompat_main.o
In file included from
/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/datapath/linux/brcompat_main.c:25:
/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/../datapath/linux/compat/include/linux/etherdevice.h:8:
error: redefinition of 'eth_hw_addr_random'
include/linux/etherdevice.h:156: note: previous definition of
'eth_hw_addr_random' was here
In file included from
/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/../datapath/linux/../vlan.h:22,
from
/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/../datapath/linux/../datapath.h:34,
from
/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/datapath/linux/brcompat_main.c:32:
/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/../datapath/linux/compat/include/linux/if_vlan.h:59:
error: redefinition of 'vlan_set_encap_proto'
include/linux/if_vlan.h:381: note: previous definition of
'vlan_set_encap_proto' was here
make[2]: ***
[/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/datapath/linux/brcompat_main.o]
Error 1
make[1]: ***
[_module_/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/datapath/linux]
Error 2
make[1]: Leaving directory `/usr/src/kernels/2.6.32-358.0.1.el6.x86_64'
make: *** [default] Error 2
make: Leaving directory
`/root/rpmbuild/BUILD/openvswitch-1.9.0/_default/datapath/linux'
error: Bad exit status from /var/tmp/rpm-tmp.oTH2KX (%build)
RPM build errors:
Bad exit status from /var/tmp/rpm-tmp.oTH2KX (%build)
On Tue, Mar 12, 2013 at 10:36 PM, Jesse Gross <[email protected]> wrote:
> Centos 6.4 backported skb_reset_mac_len() so our existing backport
> started causing conflicts.
>
> Reported-by: Denis Iskandarov <[email protected]>
> Signed-off-by: Jesse Gross <[email protected]>
> ---
> acinclude.m4 | 1 +
> datapath/linux/compat/include/linux/skbuff.h | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/acinclude.m4 b/acinclude.m4
> index 02dc952..015be9b 100644
> --- a/acinclude.m4
> +++ b/acinclude.m4
> @@ -249,6 +249,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
> [OVS_DEFINE([HAVE_SKB_WARN_LRO])])
> OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [consume_skb])
> OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_frag_page])
> + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_reset_mac_len])
>
> OVS_GREP_IFELSE([$KSRC/include/linux/string.h], [kmemdup], [],
> [OVS_GREP_IFELSE([$KSRC/include/linux/slab.h],
> [kmemdup])])
> diff --git a/datapath/linux/compat/include/linux/skbuff.h
> b/datapath/linux/compat/include/linux/skbuff.h
> index 7fbe9d8..d485b39 100644
> --- a/datapath/linux/compat/include/linux/skbuff.h
> +++ b/datapath/linux/compat/include/linux/skbuff.h
> @@ -245,7 +245,7 @@ static inline struct page *skb_frag_page(const
> skb_frag_t *frag)
> }
> #endif
>
> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,40)
> +#ifndef HAVE_SKB_RESET_MAC_LEN
> static inline void skb_reset_mac_len(struct sk_buff *skb)
> {
> skb->mac_len = skb->network_header - skb->mac_header;
> --
> 1.7.10.4
>
>
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
