From e71947c1d2cdf08b7dc60c3c7fdf49409f559fc0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 8 Jun 2020 09:46:49 +0200 Subject: iproute2: upgrade 5.6.0 -> 5.7.0 (From OE-Core rev: 4bd25076b53a2be09db4ca08a3854d8626c7ead0) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../0001-devlink.c-add-missing-include.patch | 23 ++++++++++++++++++++++ .../iproute2/iproute2_5.6.0.bb | 12 ----------- .../iproute2/iproute2_5.7.0.bb | 12 +++++++++++ 3 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_5.6.0.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb (limited to 'meta/recipes-connectivity/iproute2') diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch new file mode 100644 index 0000000000..f9580b7d44 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch @@ -0,0 +1,23 @@ +From 5df629d825df4ccc4283228bc0739da126326072 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sat, 6 Jun 2020 18:00:13 +0000 +Subject: [PATCH] devlink.c: add missing include + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + devlink/devlink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/devlink/devlink.c b/devlink/devlink.c +index 16602ab..c278e6d 100644 +--- a/devlink/devlink.c ++++ b/devlink/devlink.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "SNAPSHOT.h" + #include "list.h" diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.6.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.6.0.bb deleted file mode 100644 index 9ab9053739..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_5.6.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require iproute2.inc - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ - file://0001-libc-compat.h-add-musl-workaround.patch \ - " - -SRC_URI[md5sum] = "9da0c352707c34b8b1fec3bf42fcfd09" -SRC_URI[sha256sum] = "1b5b0e25ce6e23da7526ea1da044e814ad85ba761b10dd29c2b027c056b04692" - -# CFLAGS are computed in Makefile and reference CCOPTS -# -EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb new file mode 100644 index 0000000000..276afeab11 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb @@ -0,0 +1,12 @@ +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-devlink.c-add-missing-include.patch \ + " + +SRC_URI[sha256sum] = "725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21" + +# CFLAGS are computed in Makefile and reference CCOPTS +# +EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" -- cgit v1.2.3-54-g00ecf