| Message ID | 20210701222638.810809-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/keepalived: fix build with kernel >= 5.13 | expand |
02.07.2021 01:26, Fabrice Fontaine wrote: > Fixes: > - http://autobuild.buildroot.org/results/9a93d7d76b0a4319c29fbf7b5986bcc78539ae8b > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > .../0001-core-Fix-compiling-on-RHEL-9.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch > > diff --git a/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch b/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch > new file mode 100644 > index 0000000000..39134fcc35 > --- /dev/null > +++ b/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch > @@ -0,0 +1,34 @@ > +From 3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d Mon Sep 17 00:00:00 2001 > +From: Quentin Armitage <quentin@armitage.org.uk> > +Date: Tue, 8 Jun 2021 08:57:45 +0100 > +Subject: [PATCH] core: Fix compiling on RHEL 9 > + > +Signed-off-by: Quentin Armitage <quentin@armitage.org.uk> > + > +[Retrieved from: > +https://github.com/acassen/keepalived/commit/3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d] > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > +--- > + keepalived/core/layer4.c | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c > +index d2cc971a3..fdca04913 100644 > +--- a/keepalived/core/layer4.c > ++++ b/keepalived/core/layer4.c > +@@ -27,13 +27,14 @@ > + #include <errno.h> > + #include <unistd.h> > + #include <fcntl.h> > ++#include <netinet/in.h> > ++#include <net/if.h> > + #include <linux/icmp.h> > + #include <linux/icmpv6.h> > + #ifdef ERRQUEUE_NEEDS_SYS_TIME > + #include <sys/time.h> > + #endif > + #include <linux/errqueue.h> > +-#include <netinet/in.h> > + > + #include "layer4.h" > + #include "logger.h" > Tested-by: Maxim Kochetkov <fido_max@inbox.ru>
On Fri, 2 Jul 2021 00:26:38 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Fixes: > - http://autobuild.buildroot.org/results/9a93d7d76b0a4319c29fbf7b5986bcc78539ae8b > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > .../0001-core-Fix-compiling-on-RHEL-9.patch | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > create mode 100644 package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch Applied to master, thanks. Thomas
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Fixes: > - http://autobuild.buildroot.org/results/9a93d7d76b0a4319c29fbf7b5986bcc78539ae8b > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2021.02.x and 2021.05.x, thanks.
diff --git a/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch b/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch new file mode 100644 index 0000000000..39134fcc35 --- /dev/null +++ b/package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch @@ -0,0 +1,34 @@ +From 3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d Mon Sep 17 00:00:00 2001 +From: Quentin Armitage <quentin@armitage.org.uk> +Date: Tue, 8 Jun 2021 08:57:45 +0100 +Subject: [PATCH] core: Fix compiling on RHEL 9 + +Signed-off-by: Quentin Armitage <quentin@armitage.org.uk> + +[Retrieved from: +https://github.com/acassen/keepalived/commit/3fd0c21e4f63ac0a52b5d7a09575f0f364972e4d] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + keepalived/core/layer4.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c +index d2cc971a3..fdca04913 100644 +--- a/keepalived/core/layer4.c ++++ b/keepalived/core/layer4.c +@@ -27,13 +27,14 @@ + #include <errno.h> + #include <unistd.h> + #include <fcntl.h> ++#include <netinet/in.h> ++#include <net/if.h> + #include <linux/icmp.h> + #include <linux/icmpv6.h> + #ifdef ERRQUEUE_NEEDS_SYS_TIME + #include <sys/time.h> + #endif + #include <linux/errqueue.h> +-#include <netinet/in.h> + + #include "layer4.h" + #include "logger.h"
Fixes: - http://autobuild.buildroot.org/results/9a93d7d76b0a4319c29fbf7b5986bcc78539ae8b Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- .../0001-core-Fix-compiling-on-RHEL-9.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/keepalived/0001-core-Fix-compiling-on-RHEL-9.patch