iproute2: update 5.15.0 to 5.16.0

0001-lib-fix-ax25.h-include-for-musl.patch is the fix for musl and comes
from upstream.

(From OE-Core rev: 01db27399073804b88a38beb0ecd4c151faf3471)

Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Changhyeok Bae
2022-01-18 01:31:39 +00:00
committed by Richard Purdie
parent 6b746d75cf
commit 831626f855
2 changed files with 39 additions and 1 deletions

View File

@@ -0,0 +1,37 @@
From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 13 Jan 2022 08:14:13 +0000
Subject: [PATCH] lib: fix ax25.h include for musl
ax25.h isn't guaranteed to be avilable in netax25/*;
it's dependent on our choice of libc (it's not available
on musl at least) [0].
Let's use the version from linux-headers.
[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers
Bug: https://bugs.gentoo.org/831102
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8bced38a941a181f1468fa39541e872e51b6022f]
---
lib/ax25_ntop.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c
index cfd0e04b..3a72a43e 100644
--- a/lib/ax25_ntop.c
+++ b/lib/ax25_ntop.c
@@ -2,7 +2,7 @@
#include <errno.h>
#include <sys/socket.h>
-#include <netax25/ax25.h>
+#include <linux/ax25.h>
#include "utils.h"
--
2.32.0 (Apple Git-132)

View File

@@ -2,9 +2,10 @@ require iproute2.inc
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
file://0001-libc-compat.h-add-musl-workaround.patch \
file://0001-lib-fix-ax25.h-include-for-musl.patch \
"
SRC_URI[sha256sum] = "38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff"
SRC_URI[sha256sum] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f"
# CFLAGS are computed in Makefile and reference CCOPTS
#