From 9da8d6eaa93b61daa091d0fef54aacf3c58af3a1 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Fri, 17 Dec 2021 10:28:09 +0800 Subject: mctp: upgrade to v1.0 We have a tag for 1.0, now: better handling of local stack configuration at runtime, and the 5.15 kernel header change has been integrated. Signed-off-by: Jeremy Kerr Signed-off-by: Khem Raj --- .../mctp/0001-build-Adjust-for-kernel-mctp.h.patch | 84 ---------------------- meta-networking/recipes-support/mctp/mctp_git.bb | 8 +-- 2 files changed, 3 insertions(+), 89 deletions(-) delete mode 100644 meta-networking/recipes-support/mctp/mctp/0001-build-Adjust-for-kernel-mctp.h.patch (limited to 'meta-networking/recipes-support/mctp') diff --git a/meta-networking/recipes-support/mctp/mctp/0001-build-Adjust-for-kernel-mctp.h.patch b/meta-networking/recipes-support/mctp/mctp/0001-build-Adjust-for-kernel-mctp.h.patch deleted file mode 100644 index 83bf19770..000000000 --- a/meta-networking/recipes-support/mctp/mctp/0001-build-Adjust-for-kernel-mctp.h.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 653eccc918ef993186c312694c288b2a5b39248e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Nov 2021 13:14:55 -0700 -Subject: [PATCH] build: Adjust for kernel mctp.h - -Starting 5.15 kernel has mctp.h as well and provides some of the -defintions, therefore move the ones we need to provide in this header -outside the conditional check so its always provided regardless of -header coming from kernel or not. - -Include linux/if_link.h so it can pre-define IFLA_MCTP_UNSPEC and other -defines and there is a check for conditionally providing them here but -kernel does not have such a check, so if linux/if_link.h is included -after this header then we end up with duplicate defines - -linux/if_link.h:1267:2: error: redefinition of enumerator 'IFLA_MCTP_UNSPEC' - IFLA_MCTP_UNSPEC, - ^ -../git/src/mctp.h:74:2: note: previous definition is here - IFLA_MCTP_UNSPEC, - ^ - -Upstream-Status: Submitted [https://github.com/CodeConstruct/mctp/pull/2] -Signed-off-by: Khem Raj ---- - src/mctp.h | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - -diff --git a/src/mctp.h b/src/mctp.h -index 4f73def..e602168 100644 ---- a/src/mctp.h -+++ b/src/mctp.h -@@ -19,6 +19,7 @@ - #if HAVE_LINUX_MCTP_H - #include - #endif -+#include - - #ifndef AF_MCTP - #define AF_MCTP 45 -@@ -33,10 +34,6 @@ - - #ifndef MCTP_NET_ANY - --#ifndef MAX_ADDR_LEN --#define MAX_ADDR_LEN 32 --#endif -- - typedef uint8_t mctp_eid_t; - - struct mctp_addr { -@@ -53,6 +50,16 @@ struct sockaddr_mctp { - uint8_t __smctp_pad1; - }; - -+#define MCTP_NET_ANY 0 -+#define MCTP_ADDR_ANY 0xff -+#define MCTP_TAG_OWNER 0x08 -+ -+#endif /* MCTP_NET_ANY */ -+ -+#ifndef MAX_ADDR_LEN -+#define MAX_ADDR_LEN 32 -+#endif -+ - struct sockaddr_mctp_ext { - struct sockaddr_mctp smctp_base; - int smctp_ifindex; -@@ -61,12 +68,6 @@ struct sockaddr_mctp_ext { - unsigned char smctp_haddr[MAX_ADDR_LEN]; - }; - --#define MCTP_NET_ANY 0 --#define MCTP_ADDR_ANY 0xff --#define MCTP_TAG_OWNER 0x08 -- --#endif /* MCTP_NET_ANY */ -- - #ifndef IFLA_MCTP_MAX - - /* From if_link.h */ --- -2.33.1 - diff --git a/meta-networking/recipes-support/mctp/mctp_git.bb b/meta-networking/recipes-support/mctp/mctp_git.bb index 50d84d204..eabc6fa16 100644 --- a/meta-networking/recipes-support/mctp/mctp_git.bb +++ b/meta-networking/recipes-support/mctp/mctp_git.bb @@ -5,13 +5,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21" -PV = "0.1+git${SRCPV}" +PV = "1.0+git${SRCPV}" -SRCREV = "072bafe725c50329f99cf9d3b2624e8799e8163a" +SRCREV = "669740432af525c19a6a41cec777406fbbc24836" -SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https \ - file://0001-build-Adjust-for-kernel-mctp.h.patch \ - " +SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf