[13/39] iproute2: upgrade 5.15.0 -> 5.16.0

Message ID	20220119104117.2120127-13-alex@linutronix.de
State	New
Headers	show Return-Path: <alex.kanavin@gmail.com> ip: 209.85.128.41, mailfrom: alex.kanavin@gmail.com) From: Alexander Kanavin <alex.kanavin@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin <alex.kanavin@gmail.com> Subject: [PATCH 13/39] iproute2: upgrade 5.15.0 -> 5.16.0 Date: Wed, 19 Jan 2022 11:40:51 +0100 Message-Id: <20220119104117.2120127-13-alex@linutronix.de> In-Reply-To: <20220119104117.2120127-1-alex@linutronix.de> References: <20220119104117.2120127-1-alex@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[01/39] mesa: fold mesa-gl variant into the main recipe using mcextend class \| expand [01/39] mesa: fold mesa-gl variant into the main recipe using mcextend class [02/39] meson: fold nativesdk into the main recipe [03/39] meson: update 0.60.3 -> 0.61.1 [04/39] efivar: update 37 -> 38 [05/39] libuv: update 1.42.0 -> 1.43.0 [06/39] resolvconf: update 1.87 -> 1.91 [07/39] systemd: update 250.1 -> 250.3 [08/39] python3: update 3.10.1 -> 3.10.2 [09/39] rust: update 1.57.0 -> 1.58.0 [10/39] logrotate: update 3.18.1 -> 3.19.0, drop rotate-across-filesystems patches [11/39] libunistring: update 0.9.10 -> 1.0 [12/39] sqlite: update 3.37.1 -> 3.37.2 [13/39] iproute2: upgrade 5.15.0 -> 5.16.0 [14/39] socat: upgrade 1.7.4.2 -> 1.7.4.3 [15/39] readline: upgrade 8.1 -> 8.1.2 [16/39] go: upgrade 1.17.5 -> 1.17.6 [17/39] repo: upgrade 2.19 -> 2.20 [18/39] shadow: upgrade 4.10 -> 4.11.1 [19/39] btrfs-tools: upgrade 5.15.1 -> 5.16 [20/39] e2fsprogs: upgrade 1.46.4 -> 1.46.5 [21/39] mtd-utils: upgrade 2.1.3 -> 2.1.4 [22/39] mtools: upgrade 4.0.36 -> 4.0.37 [23/39] python3-pygments: upgrade 2.11.1 -> 2.11.2 [24/39] python3-pyrsistent: upgrade 0.18.0 -> 0.18.1 [25/39] python3-ruamel-yaml: upgrade 0.17.19 -> 0.17.20 [26/39] vala: upgrade 0.54.4 -> 0.54.6 [27/39] pigz: upgrade 2.6 -> 2.7 [28/39] rpcsvc-proto: upgrade 1.4.2 -> 1.4.3 [29/39] stress-ng: upgrade 0.13.09 -> 0.13.10 [30/39] piglit: upgrade to latest revision [31/39] libinput: upgrade 1.19.2 -> 1.19.3 [32/39] xwayland: upgrade 21.1.3 -> 21.1.4 [33/39] puzzles: upgrade to latest revision [34/39] webkitgtk: upgrade 2.34.2 -> 2.34.3 [35/39] diffoscope: upgrade 199 -> 200 [36/39] libsoup: upgrade 3.0.3 -> 3.0.4 [37/39] liburcu: upgrade 0.13.0 -> 0.13.1 [38/39] ffmpeg: upgrade 4.4.1 -> 5.0 [39/39] p11-kit: update 0.24.0 -> 0.24.1

Message ID

20220119104117.2120127-13-alex@linutronix.de

State

New

Headers

From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 13/39] iproute2: upgrade 5.15.0 -> 5.16.0
Date: Wed, 19 Jan 2022 11:40:51 +0100
Message-Id: <20220119104117.2120127-13-alex@linutronix.de>
In-Reply-To: <20220119104117.2120127-1-alex@linutronix.de>
References: <20220119104117.2120127-1-alex@linutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[01/39] mesa: fold mesa-gl variant into the main recipe using mcextend class | expand

Commit Message

Alexander Kanavin Jan. 19, 2022, 10:40 a.m. UTC

From: Alexander Kanavin <alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...d38a941a181f1468fa39541e872e51b6022f.patch | 35 +++++++++++++++++++
 ...{iproute2_5.15.0.bb => iproute2_5.16.0.bb} |  3 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-connectivity/iproute2/iproute2/8bced38a941a181f1468fa39541e872e51b6022f.patch
 rename meta/recipes-connectivity/iproute2/{iproute2_5.15.0.bb => iproute2_5.16.0.bb} (63%)

diff --git a/meta/recipes-connectivity/iproute2/iproute2/8bced38a941a181f1468fa39541e872e51b6022f.patch b/meta/recipes-connectivity/iproute2/iproute2/8bced38a941a181f1468fa39541e872e51b6022f.patch
new file mode 100644
index 0000000000..289712683e
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/8bced38a941a181f1468fa39541e872e51b6022f.patch
@@ -0,0 +1,35 @@ 
+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
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ 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 cfd0e04b0..3a72a43e9 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"
+ 
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
similarity index 63%
rename from meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
index 99a743391a..46c1b045c1 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
@@ -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://8bced38a941a181f1468fa39541e872e51b6022f.patch \
            "
 
-SRC_URI[sha256sum] = "38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff"
+SRC_URI[sha256sum] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f"
 
 # CFLAGS are computed in Makefile and reference CCOPTS
 #

[13/39] iproute2: upgrade 5.15.0 -> 5.16.0

Commit Message

Patch