Skip to contentSkip to conversation

iproute: drop old 4.19 bbappend and corresponding patches used by 4.19

PATCH New Denys Dmytriyenko 1 participant 1 message Jul 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iproute: drop old 4.19 bbappend and corresponding patches used by 4.19

---
 .../0001-add-support-for-prp-similar-to-hsr.patch  | 225 ----------
 .../iproute2/0001-utils-Implement-get_s64.patch    |  65 ---
 ...roduce-common-definitions-for-netlink-int.patch | 259 -----------
 ...-helper-to-retrieve-a-__s64-from-a-netlin.patch |  40 --
 .../0003-hsr-prp-refactor-common-code.patch        | 452 -------------------
 ...Add-helper-for-getting-a-__s32-from-netli.patch |  37 --
 ...-support-for-vlan-tagged-supervision-fram.patch | 148 -------
 ...port-for-configuring-the-taprio-scheduler.patch | 489 ---------------------
 .../0005-taprio-Add-manpage-for-tc-taprio-8.patch  | 169 -------
 ...taprio-Add-support-for-changing-schedules.patch | 151 -------
 ...support-for-cycle_time-and-cycle_time_ext.patch | 148 -------
 .../iproute2/0008-utils-Fix-get_s64-function.patch |  35 --
 ...0009-taprio-Add-support-for-setting-flags.patch |  78 ----
 ...prio-add-support-for-setting-txtime_delay.patch |  97 ----
 .../0011-tc-taprio-Update-documentation.patch      |  81 ----
 ...sync-pkt_sched-header-with-kernel-version.patch | 131 ------
 .../iproute2/iproute2_4.19.0.bbappend              |  22 -
 17 files changed, 2627 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-add-support-for-prp-similar-to-hsr.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-utils-Implement-get_s64.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0002-hsr-prp-introduce-common-definitions-for-netlink-int.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0002-include-Add-helper-to-retrieve-a-__s64-from-a-netlin.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0003-hsr-prp-refactor-common-code.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0003-libnetlink-Add-helper-for-getting-a-__s32-from-netli.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0004-hsr-prp-add-support-for-vlan-tagged-supervision-fram.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0004-tc-Add-support-for-configuring-the-taprio-scheduler.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0005-taprio-Add-manpage-for-tc-taprio-8.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0006-taprio-Add-support-for-changing-schedules.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0007-taprio-Add-support-for-cycle_time-and-cycle_time_ext.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0008-utils-Fix-get_s64-function.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0009-taprio-Add-support-for-setting-flags.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0010-taprio-add-support-for-setting-txtime_delay.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0011-tc-taprio-Update-documentation.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2/0012-sync-pkt_sched-header-with-kernel-version.patch
 delete mode 100644 meta-arago-distro/recipes-connectivity/iproute2/iproute2_4.19.0.bbappend
meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-add-support-for-prp-similar-to-hsr.patch deleted +0 -225
deleted file mode 100644
index 8cb1047..0000000
@@ -1,225 +0,0 @@
-From 8cce18533dff81eb72c07acb20775576b8bd2c25 Mon Sep 17 00:00:00 2001
-From: Murali Karicheri <[email protected]>
-Date: Wed, 19 Sep 2018 16:41:30 -0400
-Subject: [PATCH 1/4] add support for prp similar to hsr
-
-prp protocol is similar to hsr in many aspects and this patch add a
-command type prp to create prp interface using two slave interfaces
-similar to hsr
-
-Upstream-Status: Pending
-
-Signed-off-by: Murali Karicheri <[email protected]>
----
- include/uapi/linux/if_link.h |  14 ++++-
- ip/Makefile                  |   2 +-
- ip/iplink_prp.c              | 147 +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 160 insertions(+), 3 deletions(-)
- create mode 100644 ip/iplink_prp.c
-
-diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
-index f4a9715..5a6d728 100644
---- a/include/uapi/linux/if_link.h
-+++ b/include/uapi/linux/if_link.h
-@@ -852,7 +852,6 @@ enum {
- 
- 
- /* HSR section */
--
- enum {
- 	IFLA_HSR_UNSPEC,
- 	IFLA_HSR_SLAVE1,
-@@ -863,7 +862,6 @@ enum {
- 	IFLA_HSR_VERSION,		/* HSR version */
- 	__IFLA_HSR_MAX,
- };
--
- #define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1)
- 
- /* STATS section */
-@@ -997,4 +995,16 @@ struct ifla_rmnet_flags {
- 	__u32	mask;
- };
- 
-+/* PRP section */
-+enum {
-+	IFLA_PRP_UNSPEC,
-+	IFLA_PRP_SLAVE1,
-+	IFLA_PRP_SLAVE2,
-+	IFLA_PRP_MULTICAST_SPEC,	/* Last byte of supervision addr */
-+	IFLA_PRP_SUPERVISION_ADDR,	/* Supervision frame multicast addr */
-+	IFLA_PRP_SEQ_NR,
-+	__IFLA_PRP_MAX,
-+};
-+#define IFLA_PRP_MAX (__IFLA_PRP_MAX - 1)
-+
- #endif /* _LINUX_IF_LINK_H */
-diff --git a/ip/Makefile b/ip/Makefile
-index a88f936..c0efc3a 100644
---- a/ip/Makefile
-+++ b/ip/Makefile
-@@ -8,7 +8,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
-     iplink_macvlan.o ipl2tp.o link_vti.o link_vti6.o \
-     iplink_vxlan.o tcp_metrics.o iplink_ipoib.o ipnetconf.o link_ip6tnl.o \
-     link_iptnl.o link_gre6.o iplink_bond.o iplink_bond_slave.o iplink_hsr.o \
--    iplink_bridge.o iplink_bridge_slave.o ipfou.o iplink_ipvlan.o \
-+    iplink_prp.o iplink_bridge.o iplink_bridge_slave.o ipfou.o iplink_ipvlan.o \
-     iplink_geneve.o iplink_vrf.o iproute_lwtunnel.o ipmacsec.o ipila.o \
-     ipvrf.o iplink_xstats.o ipseg6.o iplink_netdevsim.o iplink_rmnet.o
- 
-diff --git a/ip/iplink_prp.c b/ip/iplink_prp.c
-new file mode 100644
-index 0000000..46533e9
---- /dev/null
-+++ b/ip/iplink_prp.c
-@@ -0,0 +1,147 @@
-+/*
-+ * iplink_prp.c	PRP device support
-+ *
-+ *		This program is free software; you can redistribute it and/or
-+ *		modify it under the terms of the GNU General Public License
-+ *		as published by the Free Software Foundation; either version
-+ *		2 of the License, or (at your option) any later version.
-+ *
-+ * Authors:	Murali Karicheri <[email protected]>
-+ *
-+ *		Based on iplink_hsr.c by Arvid Brodin <[email protected]>
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/socket.h>  /* Needed by linux/if.h for some reason */
-+#include <linux/if.h>
-+#include <linux/if_arp.h>
-+#include "rt_names.h"
-+#include "utils.h"
-+#include "ip_common.h"
-+
-+static void print_usage(FILE *f)
-+{
-+	fprintf(f,
-+"Usage:\tip link add name NAME type prp slave1 SLAVE1-IF slave2 SLAVE2-IF\n"
-+"\t[ supervision ADDR-BYTE ]\n"
-+"\n"
-+"NAME\n"
-+"	name of new prp device (e.g. prp0)\n"
-+"SLAVE1-IF, SLAVE2-IF\n"
-+"	the two slave devices bound to the PRP device\n"
-+"ADDR-BYTE\n"
-+"	0-255; the last byte of the multicast address used for PRP supervision\n"
-+"	frames (default = 0)\n");
-+}
-+
-+static void usage(void)
-+{
-+	print_usage(stderr);
-+}
-+
-+static int prp_parse_opt(struct link_util *lu, int argc, char **argv,
-+			 struct nlmsghdr *n)
-+{
-+	int ifindex;
-+	unsigned char multicast_spec;
-+
-+	while (argc > 0) {
-+		if (matches(*argv, "supervision") == 0) {
-+			NEXT_ARG();
-+			if (get_u8(&multicast_spec, *argv, 0))
-+				invarg("ADDR-BYTE is invalid", *argv);
-+			addattr_l(n, 1024, IFLA_PRP_MULTICAST_SPEC,
-+				  &multicast_spec, 1);
-+		} else if (matches(*argv, "slave1") == 0) {
-+			NEXT_ARG();
-+			ifindex = ll_name_to_index(*argv);
-+			if (ifindex == 0)
-+				invarg("No such interface", *argv);
-+			addattr_l(n, 1024, IFLA_PRP_SLAVE1, &ifindex, 4);
-+		} else if (matches(*argv, "slave2") == 0) {
-+			NEXT_ARG();
-+			ifindex = ll_name_to_index(*argv);
-+			if (ifindex == 0)
-+				invarg("No such interface", *argv);
-+			addattr_l(n, 1024, IFLA_PRP_SLAVE2, &ifindex, 4);
-+		} else if (matches(*argv, "help") == 0) {
-+			usage();
-+			return -1;
-+		} else {
-+			fprintf(stderr, "prp: what is \"%s\"?\n", *argv);
-+			usage();
-+			return -1;
-+		}
-+		argc--, argv++;
-+	}
-+
-+	return 0;
-+}
-+
-+static void prp_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
-+{
-+	SPRINT_BUF(b1);
-+
-+	if (!tb)
-+		return;
-+
-+	if (tb[IFLA_PRP_SLAVE1] &&
-+	    RTA_PAYLOAD(tb[IFLA_PRP_SLAVE1]) < sizeof(__u32))
-+		return;
-+	if (tb[IFLA_PRP_SLAVE2] &&
-+	    RTA_PAYLOAD(tb[IFLA_PRP_SLAVE2]) < sizeof(__u32))
-+		return;
-+	if (tb[IFLA_PRP_SEQ_NR] &&
-+	    RTA_PAYLOAD(tb[IFLA_PRP_SEQ_NR]) < sizeof(__u16))
-+		return;
-+	if (tb[IFLA_PRP_SUPERVISION_ADDR] &&
-+	    RTA_PAYLOAD(tb[IFLA_PRP_SUPERVISION_ADDR]) < ETH_ALEN)
-+		return;
-+
-+	if (tb[IFLA_PRP_SLAVE1])
-+		print_string(PRINT_ANY,
-+			     "slave1",
-+			     "slave1 %s ",
-+			     ll_index_to_name(rta_getattr_u32(tb[IFLA_PRP_SLAVE1])));
-+	else
-+		print_null(PRINT_ANY, "slave1", "slave1 %s ", "<none>");
-+
-+	if (tb[IFLA_PRP_SLAVE2])
-+		print_string(PRINT_ANY,
-+			     "slave2",
-+			     "slave2 %s ",
-+			     ll_index_to_name(rta_getattr_u32(tb[IFLA_HSR_SLAVE2])));
-+	else
-+		print_null(PRINT_ANY, "slave2", "slave2 %s ", "<none>");
-+
-+	if (tb[IFLA_PRP_SEQ_NR])
-+		print_int(PRINT_ANY,
-+			  "seq_nr",
-+			  "sequence %d ",
-+			  rta_getattr_u16(tb[IFLA_PRP_SEQ_NR]));
-+
-+	if (tb[IFLA_PRP_SUPERVISION_ADDR])
-+		print_string(PRINT_ANY,
-+			     "supervision_addr",
-+			     "supervision %s ",
-+			     ll_addr_n2a(RTA_DATA(tb[IFLA_PRP_SUPERVISION_ADDR]),
-+					 RTA_PAYLOAD(tb[IFLA_PRP_SUPERVISION_ADDR]),
-+					 ARPHRD_VOID,
-+					 b1, sizeof(b1)));
-+}
-+
-+static void prp_print_help(struct link_util *lu, int argc, char **argv,
-+	FILE *f)
-+{
-+	print_usage(f);
-+}
-+
-+struct link_util prp_link_util = {
-+	.id		= "prp",
-+	.maxattr	= IFLA_PRP_MAX,
-+	.parse_opt	= prp_parse_opt,
-+	.print_opt	= prp_print_opt,
-+	.print_help	= prp_print_help,
-+};
--- 
-2.7.4
-
meta-arago-distro/recipes-connectivity/iproute2/iproute2/0001-utils-Implement-get_s64.patch deleted +0 -65

65 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0002-hsr-prp-introduce-common-definitions-for-netlink-int.patch deleted +0 -259

259 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0002-include-Add-helper-to-retrieve-a-__s64-from-a-netlin.patch deleted +0 -40
deleted file mode 100644
index 1098145..0000000
@@ -1,40 +0,0 @@
-From 6d0bcdd9d0283768798227f4046414ed7da42047 Mon Sep 17 00:00:00 2001
-From: Vinicius Costa Gomes <[email protected]>
-Date: Fri, 5 Oct 2018 16:25:18 -0700
-Subject: [PATCH 02/12] include: Add helper to retrieve a __s64 from a netlink
- msg
-
-Upstream-Status: Backport
-commit de63cd90444ac9fdf238f950c16cafe351846691 upstream.
-
-This allows signed 64-bit integers to be retrieved from a netlink
-message.
-
-Signed-off-by: Vinicius Costa Gomes <[email protected]>
-Signed-off-by: David Ahern <[email protected]>
-Signed-off-by: Murali Karicheri <[email protected]>
----
- include/libnetlink.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/include/libnetlink.h b/include/libnetlink.h
-index 9d9249e6..ffc49e56 100644
---- a/include/libnetlink.h
-+++ b/include/libnetlink.h
-@@ -185,6 +185,13 @@ static inline __u64 rta_getattr_u64(const struct rtattr *rta)
- 	memcpy(&tmp, RTA_DATA(rta), sizeof(__u64));
- 	return tmp;
- }
-+static inline __s64 rta_getattr_s64(const struct rtattr *rta)
-+{
-+	__s64 tmp;
-+
-+	memcpy(&tmp, RTA_DATA(rta), sizeof(tmp));
-+	return tmp;
-+}
- static inline const char *rta_getattr_str(const struct rtattr *rta)
- {
- 	return (const char *)RTA_DATA(rta);
--- 
-2.18.1
-
meta-arago-distro/recipes-connectivity/iproute2/iproute2/0003-hsr-prp-refactor-common-code.patch deleted +0 -452

452 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0003-libnetlink-Add-helper-for-getting-a-__s32-from-netli.patch deleted +0 -37
deleted file mode 100644
index 983e901..0000000
@@ -1,37 +0,0 @@
-From ca37dce0e9c50645a3473dc942a33478eb79378d Mon Sep 17 00:00:00 2001
-From: Jesus Sanchez-Palencia <[email protected]>
-Date: Fri, 5 Oct 2018 16:25:19 -0700
-Subject: [PATCH 03/12] libnetlink: Add helper for getting a __s32 from netlink
- msgs
-
-Upstream-Status: Backport
-commit d791f3ad869659da4b151eded060840a88d9656a upstream.
-
-This function retrieves a signed 32-bit integer from a netlink message
-and returns it.
-
-Signed-off-by: Jesus Sanchez-Palencia <[email protected]>
-Signed-off-by: David Ahern <[email protected]>
-Signed-off-by: Murali Karicheri <[email protected]>
----
- include/libnetlink.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/libnetlink.h b/include/libnetlink.h
-index ffc49e56..c44c3c72 100644
---- a/include/libnetlink.h
-+++ b/include/libnetlink.h
-@@ -185,6 +185,10 @@ static inline __u64 rta_getattr_u64(const struct rtattr *rta)
- 	memcpy(&tmp, RTA_DATA(rta), sizeof(__u64));
- 	return tmp;
- }
-+static inline __s32 rta_getattr_s32(const struct rtattr *rta)
-+{
-+	return *(__s32 *)RTA_DATA(rta);
-+}
- static inline __s64 rta_getattr_s64(const struct rtattr *rta)
- {
- 	__s64 tmp;
--- 
-2.18.1
-
meta-arago-distro/recipes-connectivity/iproute2/iproute2/0004-hsr-prp-add-support-for-vlan-tagged-supervision-fram.patch deleted +0 -148

148 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0004-tc-Add-support-for-configuring-the-taprio-scheduler.patch deleted +0 -489

489 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0005-taprio-Add-manpage-for-tc-taprio-8.patch deleted +0 -169

169 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0006-taprio-Add-support-for-changing-schedules.patch deleted +0 -151

151 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0007-taprio-Add-support-for-cycle_time-and-cycle_time_ext.patch deleted +0 -148

148 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0008-utils-Fix-get_s64-function.patch deleted +0 -35
deleted file mode 100644
index 63a02b4..0000000
@@ -1,35 +0,0 @@
-From 0c672a07e1d5a8068f2323e88a72e5349dacbed9 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <[email protected]>
-Date: Thu, 4 Jul 2019 14:24:27 +0200
-Subject: [PATCH 08/12] utils: Fix get_s64() function
-
-Upstream-Status: Backport
-commit c875433b145e33645798ecfe4d99bcb28c80d1e9 upstream.
-
-get_s64() uses internally strtoll() to parse the value out of a given
-string. strtoll() returns a long long. However, the intermediate variable is
-long only which might be 32 bit on some systems. So, fix it.
-
-Signed-off-by: Kurt Kanzenbach <[email protected]>
-Signed-off-by: Stephen Hemminger <[email protected]>
-Signed-off-by: Murali Karicheri <[email protected]>
----
- lib/utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/utils.c b/lib/utils.c
-index be29530f..9c121ce3 100644
---- a/lib/utils.c
-+++ b/lib/utils.c
-@@ -386,7 +386,7 @@ int get_u8(__u8 *val, const char *arg, int base)
- 
- int get_s64(__s64 *val, const char *arg, int base)
- {
--	long res;
-+	long long res;
- 	char *ptr;
- 
- 	errno = 0;
--- 
-2.18.1
-
meta-arago-distro/recipes-connectivity/iproute2/iproute2/0009-taprio-Add-support-for-setting-flags.patch deleted +0 -78

78 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0010-taprio-add-support-for-setting-txtime_delay.patch deleted +0 -97

97 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0011-tc-taprio-Update-documentation.patch deleted +0 -81

81 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2/0012-sync-pkt_sched-header-with-kernel-version.patch deleted +0 -131

131 lines not on this page · raw message

meta-arago-distro/recipes-connectivity/iproute2/iproute2_4.19.0.bbappend deleted +0 -22
deleted file mode 100644
index 7fa33f6..0000000
@@ -1,22 +0,0 @@
-PR_append = ".arago6"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append = " \
-    file://0001-add-support-for-prp-similar-to-hsr.patch \
-    file://0002-hsr-prp-introduce-common-definitions-for-netlink-int.patch \
-    file://0003-hsr-prp-refactor-common-code.patch \
-    file://0004-hsr-prp-add-support-for-vlan-tagged-supervision-fram.patch \
-    file://0001-utils-Implement-get_s64.patch \
-    file://0002-include-Add-helper-to-retrieve-a-__s64-from-a-netlin.patch \
-    file://0003-libnetlink-Add-helper-for-getting-a-__s32-from-netli.patch \
-    file://0004-tc-Add-support-for-configuring-the-taprio-scheduler.patch \
-    file://0005-taprio-Add-manpage-for-tc-taprio-8.patch \
-    file://0006-taprio-Add-support-for-changing-schedules.patch \
-    file://0007-taprio-Add-support-for-cycle_time-and-cycle_time_ext.patch \
-    file://0008-utils-Fix-get_s64-function.patch \
-    file://0009-taprio-Add-support-for-setting-flags.patch \
-    file://0010-taprio-add-support-for-setting-txtime_delay.patch \
-    file://0011-tc-taprio-Update-documentation.patch \
-    file://0012-sync-pkt_sched-header-with-kernel-version.patch \
-"
Signature · 1 line
2.7.4