package/i2c-tools: bump to version 4.3

Drop upstream patch.

Update README hash for text changes that are not related to license.

Cc: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Cc: Matt Weber <matthew.weber@collins.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Baruch Siach 2021-07-30 16:12:42 +03:00 committed by Thomas Petazzoni
parent 196b29f327
commit 92f9eb53ba
3 changed files with 3 additions and 44 deletions

View File

@ -1,41 +0,0 @@
From 06a1909ae1e8ae1edc70dc48dd22a32ba5eceecb Mon Sep 17 00:00:00 2001
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Date: Tue, 9 Feb 2021 12:05:56 +0100
Subject: [PATCH] Revert "tools: i2ctransfer: add check for returned length
from driver"
This reverts commit 34806fc4e7090b34e32fa1110d546ab5ce01a6a0. It was
developed against an experimental kernel. The regular kernel does not
update the new message length to userspace, so the check is always false
positive. We can't change the kernel behaviour because it would break
the ABI. So revert this commit.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
[Peter: drop CHANGES update]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
tools/i2ctransfer.c | 7 +------
1 file changed, 1 insertions(+), 6 deletions(-)
diff --git a/tools/i2ctransfer.c b/tools/i2ctransfer.c
index f2a4df8..b0e8d43 100644
--- a/tools/i2ctransfer.c
+++ b/tools/i2ctransfer.c
@@ -88,12 +88,7 @@ static void print_msgs(struct i2c_msg *msgs, __u32 nmsgs, unsigned flags)
int recv_len = msgs[i].flags & I2C_M_RECV_LEN;
int print_buf = (read && (flags & PRINT_READ_BUF)) ||
(!read && (flags & PRINT_WRITE_BUF));
- __u16 len = msgs[i].len;
-
- if (recv_len && print_buf && len != msgs[i].buf[0] + 1) {
- fprintf(stderr, "Correcting wrong msg length after recv_len! Please fix the I2C driver and/or report.\n");
- len = msgs[i].buf[0] + 1;
- }
+ __u16 len = recv_len ? msgs[i].buf[0] + 1 : msgs[i].len;
if (flags & PRINT_HEADER) {
fprintf(output, "msg %u: addr 0x%02x, %s, len ",
--
2.20.1

View File

@ -1,7 +1,7 @@
# From https://www.kernel.org/pub/software/utils/i2c-tools/sha256sums.asc
sha256 37f2dabc7082d185903ff21d1f584b5dcb4dd2eb2c879bbd8d7c50ae900dacd6 i2c-tools-4.2.tar.xz
sha256 1f899e43603184fac32f34d72498fc737952dbc9c97a8dd9467fadfdf4600cf9 i2c-tools-4.3.tar.xz
# License files
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
sha256 370e8bc3d45744170cc4b12dc5135b107fa40a00179a19973fbd714146dec04c README
sha256 2293b6e9076984d02184ff620baac557143e16cfa47d88f0a791d05a1271742c README

View File

@ -4,7 +4,7 @@
#
################################################################################
I2C_TOOLS_VERSION = 4.2
I2C_TOOLS_VERSION = 4.3
I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz
I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools
I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus), LGPL-2.1+ (libi2c)