All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wang Mingyu <wangmy@fujitsu.com>
To: <openembedded-core@lists.openembedded.org>
Cc: Wang Mingyu <wangmy@fujitsu.com>
Subject: [OE-core] [PATCH] iproute2: upgrade 5.16.0 -> 5.17.0
Date: Mon, 28 Mar 2022 17:52:50 +0800	[thread overview]
Message-ID: <1648461173-15770-2-git-send-email-wangmy@fujitsu.com> (raw)
In-Reply-To: <1648461173-15770-1-git-send-email-wangmy@fujitsu.com>

0001-lib-fix-ax25.h-include-for-musl.patch
removed since it's included in 5.17.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...0001-lib-fix-ax25.h-include-for-musl.patch | 37 -------------------
 ...{iproute2_5.16.0.bb => iproute2_5.17.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch
 rename meta/recipes-connectivity/iproute2/{iproute2_5.16.0.bb => iproute2_5.17.0.bb} (64%)

diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch
deleted file mode 100644
index e4c0cf4aa5..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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)
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb
similarity index 64%
rename from meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb
index 871f8d8fb7..becbaa9190 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb
@@ -2,10 +2,9 @@ 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] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f"
+SRC_URI[sha256sum] = "6e384f1b42c75e1a9daac57866da37dcff909090ba86eb25a6e764da7893660e"
 
 # CFLAGS are computed in Makefile and reference CCOPTS
 #
-- 
2.25.1



  reply	other threads:[~2022-03-28  9:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-28  9:52 [OE-core] [PATCH] glib-networking: upgrade 2.70.1 -> 2.72.0 Wang Mingyu
2022-03-28  9:52 ` Wang Mingyu [this message]
2022-03-28  9:52 ` [OE-core] [PATCH] libevdev: upgrade 1.12.0 -> 1.12.1 Wang Mingyu
2022-03-28  9:52 ` [OE-core] [PATCH] libsoup: upgrade 3.0.4 -> 3.0.5 Wang Mingyu
2022-03-28  9:52 ` [OE-core] [PATCH] lttng-modules: upgrade 2.13.2 -> 2.13.3 Wang Mingyu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1648461173-15770-2-git-send-email-wangmy@fujitsu.com \
    --to=wangmy@fujitsu.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.