From fc782a71a426c1bcf1b6b6de8734cd77a057da70 Mon Sep 17 00:00:00 2001 From: jpzhang Date: Tue, 1 Sep 2020 21:04:23 +0800 Subject: [PATCH] Modify the referenced header file --- Modify-the-referenced-header-file.patch | 15 +++++++++++++++ openvswitch-kmod.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 Modify-the-referenced-header-file.patch diff --git a/Modify-the-referenced-header-file.patch b/Modify-the-referenced-header-file.patch new file mode 100644 index 0000000..6ec3826 --- /dev/null +++ b/Modify-the-referenced-header-file.patch @@ -0,0 +1,15 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index a581e1e..c43ffce 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -712,8 +712,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ + [int nf_conncount_add], + [], [OVS_DEFINE([HAVE_UPSTREAM_NF_CONNCOUNT])])]) + +- OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32]) +- OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32_max]) ++ OVS_GREP_IFELSE([$KSRC/include/linux/prandom.h], [prandom_u32]) ++ OVS_GREP_IFELSE([$KSRC/include/linux/prandom.h], [prandom_u32_max]) + + OVS_GREP_IFELSE([$KSRC/include/net/rtnetlink.h], [get_link_net]) + OVS_GREP_IFELSE([$KSRC/include/net/rtnetlink.h], [name_assign_type]) diff --git a/openvswitch-kmod.spec b/openvswitch-kmod.spec index d572a56..f0a9819 100644 --- a/openvswitch-kmod.spec +++ b/openvswitch-kmod.spec @@ -14,7 +14,7 @@ Name: openvswitch-kmod Version: 2.12.0 -Release: 1 +Release: 2 Summary: Open vSwitch Kernel Modules License: GPLv2 URL: http://www.openvswitch.org/ @@ -86,6 +86,7 @@ Patch63: netdev-afxdp-Avoid-removing-of-XDP-program-if-not-lo.patch Patch64: system-afxdp.at-Add-test-for-infinite-re-addition-of.patch Patch65: ovsdb-cluster.at-Wait-until-leader-is-elected-before.patch Patch66: ovsdb-raft-Fix-the-problem-when-cluster-restarted-af.patch +Patch67: Modify-the-referenced-header-file.patch #Source1: openvswitch-init Buildroot: /tmp/openvswitch-xen-rpm @@ -182,7 +183,11 @@ fi %attr(755,root,root) /usr/share/openvswitch/scripts/ovs-kmod-manage.sh %changelog +* Tue Sep 01 2020 zhangjiapeng - 2.12.0 +- Modify the referenced header file + * Sat Dec 21 2019 openEuler Buildteam - 2.12.0 - Add opensource patch + * Fri Nov 22 2019 openEuler Buildteam - 2.12.0 - First build