mctp: upgrade 2.1 -> 2.4

mctp-2.4 was released.  It includes a previously submitted patch,
so drop that.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Patrick Williams 2025-10-22 06:21:40 -04:00 committed by Khem Raj
parent c1c5a5ade4
commit 5a4c632ac3
2 changed files with 2 additions and 41 deletions

View File

@ -1,38 +0,0 @@
From 166b2251a156a03a80318533440178ac0b913945 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 17 Feb 2025 21:29:41 -0800
Subject: [PATCH] mctp-bench: Adjust headers
bits/time.h is not be included directly, instead use time.h
since poll.h is included there is no need to include sys/poll.h
Fixes
../git/src/mctp-bench.c:2:10: fatal error: 'bits/time.h' file not found
2 | #include <bits/time.h>
| ^~~~~~~~~~~~~
Upstream-Status: Submitted [https://github.com/CodeConstruct/mctp/pull/65]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/mctp-bench.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/mctp-bench.c b/src/mctp-bench.c
index eeb6fcf..60b3bb0 100644
--- a/src/mctp-bench.c
+++ b/src/mctp-bench.c
@@ -1,5 +1,5 @@
#define _XOPEN_SOURCE 700
-#include <bits/time.h>
+#include <time.h>
#include <err.h>
#include <errno.h>
#include <poll.h>
@@ -9,7 +9,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <sys/socket.h>
#include <time.h>
#include <unistd.h>

View File

@ -5,10 +5,9 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21"
SRCREV = "dd944cf5b5a8b834f3685bcb2017190258dbcd0b"
SRCREV = "8b019a3e4d335c7d31099762762dfee2e4705d37"
SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https \
file://0001-mctp-bench-Adjust-headers.patch"
SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https;tag=v${PV}"
inherit meson pkgconfig systemd