Signed-off-by: Khem Raj <[email protected]> --- ...clude-linux-if_ether.h-if-not-needed.patch | 34 +++++++++++++++++++ .../keepalived/keepalived_2.3.2.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch
diff --git a/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch b/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch new file mode 100644 index 0000000000..f6a38668ee --- /dev/null +++ b/meta-networking/recipes-daemons/keepalived/keepalived/0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch @@ -0,0 +1,34 @@ +From f129c588f7c8a66e595d8ae96a43d585018e79cd Mon Sep 17 00:00:00 2001 +From: Quentin Armitage <[email protected]> +Date: Thu, 7 Nov 2024 11:09:43 +0000 +Subject: [PATCH] vrrp: Don't include <linux/if_ether.h> if not needed + +The musl headers do not allow including both <linux/if_ether.h> and +<net/ethernet.h> since they both define struct ethhdr. + +It is likely that we do not need to include <linux/if_ether.h> at all +since with both glibc and musl including <net/ethernet.h> is sufficient, +but removing <linux/if_ether.h> is for another day. + +Upstream-Status: Backport [https://github.com/acassen/keepalived/commit/f129c588f7c8a66e595d8ae96a43d585018e79cd] +Signed-off-by: Quentin Armitage <[email protected]> +--- + keepalived/vrrp/vrrp.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c +index 96b2c4c8..4b06e387 100644 +--- a/keepalived/vrrp/vrrp.c ++++ b/keepalived/vrrp/vrrp.c +@@ -40,8 +40,10 @@ + #include <netinet/ip6.h> + #include <stdint.h> + #include <net/if_arp.h> +-#include <linux/if_ether.h> + #include <net/ethernet.h> ++#if !defined ETH_HLEN || !defined ETH_ZLEN ++#include <linux/if_ether.h> /* This may not be needed at all - try removing and see if any issues raised */ ++#endif + #ifdef _NETWORK_TIMESTAMP_ + #include <linux/net_tstamp.h> + #endif diff --git a/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb index 2cb76e6d41..c0a2e57bfb 100644 --- a/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb +++ b/meta-networking/recipes-daemons/keepalived/keepalived_2.3.2.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \ + file://0001-vrrp-Don-t-include-linux-if_ether.h-if-not-needed.patch \ " SRC_URI[sha256sum] = "77f4a22e5a23fa8e49b8916acdfb584c864e72905a2f1de2a7f62ed40a896160" UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases";
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114009): https://lists.openembedded.org/g/openembedded-devel/message/114009 Mute This Topic: https://lists.openembedded.org/mt/109728522/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
