added my Recipes
This commit is contained in:
@@ -0,0 +1,58 @@
|
||||
From a85ca79143a87286f793957e803ee3daf03c2b57 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 6 Jul 2021 14:06:44 -0700
|
||||
Subject: [PATCH] layer4: Change order of include files
|
||||
|
||||
curent order to include standard headers first is causing an isue with
|
||||
glibc 2.34 + kernel-headers 5.13+ where order of including netinet/in.h
|
||||
and linux/in.h matters and it does not define __UAPI_DEF_IN_IPPROTO
|
||||
before including linux/in.h and then later includes netinet/in.h which
|
||||
then means lot of definitions will be defined twice and compile would
|
||||
fail. Re-ordering the local headers to appear first solves the issue
|
||||
amicably, and I think this is right order too
|
||||
|
||||
Upsteam-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
keepalived/core/layer4.c | 21 ++++++++++-----------
|
||||
1 file changed, 10 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c
|
||||
index 90cdc84..c122c29 100644
|
||||
--- a/keepalived/core/layer4.c
|
||||
+++ b/keepalived/core/layer4.c
|
||||
@@ -23,6 +23,16 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
+#include "layer4.h"
|
||||
+#include "logger.h"
|
||||
+#include "scheduler.h"
|
||||
+#ifdef _WITH_LVS_
|
||||
+#include "check_api.h"
|
||||
+#endif
|
||||
+#include "bitops.h"
|
||||
+#include "utils.h"
|
||||
+#include "align.h"
|
||||
+
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
@@ -33,17 +43,6 @@
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#include <linux/errqueue.h>
|
||||
-#include <netinet/in.h>
|
||||
-
|
||||
-#include "layer4.h"
|
||||
-#include "logger.h"
|
||||
-#include "scheduler.h"
|
||||
-#ifdef _WITH_LVS_
|
||||
-#include "check_api.h"
|
||||
-#endif
|
||||
-#include "bitops.h"
|
||||
-#include "utils.h"
|
||||
-#include "align.h"
|
||||
|
||||
// #define ICMP_DEBUG 1
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
SUMMARY = "High Availability monitor built upon LVS, VRRP and service pollers"
|
||||
DESCRIPTION = "Keepalived is a routing software written in C. The main goal \
|
||||
of this project is to provide simple and robust facilities for loadbalancing \
|
||||
and high-availability to Linux system and Linux based infrastructures. \
|
||||
Loadbalancing framework relies on well-known and widely used Linux Virtual \
|
||||
Server (IPVS) kernel module providing Layer4 loadbalancing \
|
||||
"
|
||||
HOMEPAGE = "http://www.keepalived.org/"
|
||||
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \
|
||||
file://0001-layer4-Change-order-of-include-files.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "103692bd5345a4ed9f4581632ea636214fdf53e45682e200aab122c4fa674ece"
|
||||
UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases"
|
||||
|
||||
DEPENDS = "libnfnetlink openssl"
|
||||
|
||||
inherit autotools pkgconfig systemd
|
||||
|
||||
PACKAGECONFIG ??= "libnl snmp \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
|
||||
"
|
||||
PACKAGECONFIG[libnl] = "--enable-libnl,--disable-libnl,libnl"
|
||||
PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
|
||||
PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--with-init=SYSV,systemd"
|
||||
|
||||
EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d"
|
||||
|
||||
do_install:append() {
|
||||
if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then
|
||||
chmod 0755 ${D}${sysconfdir}/init.d/${BPN}
|
||||
sed -i 's#rc.d/##' ${D}${sysconfdir}/init.d/${BPN}
|
||||
fi
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
install -D -m 0644 ${B}/${BPN}/${BPN}.service ${D}${systemd_system_unitdir}/${BPN}.service
|
||||
fi
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt"
|
||||
|
||||
SYSTEMD_SERVICE:${PN} = "keepalived.service"
|
||||
SYSTEMD_AUTO_ENABLE ?= "disable"
|
||||
Reference in New Issue
Block a user