summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-12-19 15:29:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-20 14:53:55 +0000
commit32e92bbe7f4cc5e1e6de3460fb0aaaef5cbfc88a (patch)
treed88737bf75c6be1e6523a259a4ffd7c997caccd9
parent4ad9d0f6f7941cea89c3121405f961666f1e0c7f (diff)
downloadpoky-32e92bbe7f4cc5e1e6de3460fb0aaaef5cbfc88a.tar.gz
i2c-tools: upgrade 4.0 -> 4.1
* For changes, see: https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/log/?qt=range&q=v4.0...v4.1 * Remove upstreamed patches (From OE-Core rev: 085530e8fff016d7cadcae4a769a82cddf9e6695) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch32
-rw-r--r--meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch37
-rw-r--r--meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch66
-rw-r--r--meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch98
-rw-r--r--meta/recipes-devtools/i2c-tools/i2c-tools_4.1.bb (renamed from meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb)8
5 files changed, 2 insertions, 239 deletions
diff --git a/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch b/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
deleted file mode 100644
index 5b1a53844e..0000000000
--- a/meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 01674fefe3bd24fd93412fbb3eb4e85fe70c80aa Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Mon, 18 Dec 2017 16:01:39 +0200
4Subject: [PATCH] i2c-tools: eeprog/Module.mk: Add missing dependency
5
6Absence of this dependency caused parallel build to run into a race
7and break.
8
9Upstream-Status: Accepted
10https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/commit/?id=f87c97317012a3b96b67237925893b8ffd5f4f50
11
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13---
14 eeprog/Module.mk | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/eeprog/Module.mk b/eeprog/Module.mk
18index 9d36869..d215855 100644
19--- a/eeprog/Module.mk
20+++ b/eeprog/Module.mk
21@@ -20,7 +20,7 @@ EEPROG_TARGETS := eeprog
22 # Programs
23 #
24
25-$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o
26+$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o $(LIB_DEPS)
27 $(CC) $(LDFLAGS) -o $@ $^ $(EEPROG_LDFLAGS)
28
29 #
30--
312.4.0
32
diff --git a/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch b/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
deleted file mode 100644
index 426b4330ea..0000000000
--- a/meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From a6a59693066fd8da81f7107479df3e32a129247d Mon Sep 17 00:00:00 2001
2From: Jean Delvare <jdelvare@suse.de>
3Date: Wed, 6 Dec 2017 09:55:04 +0100
4Subject: [PATCH] lib/Module.mk: Add missing dependencies
5
6The lib symlinks lacked a dependency to the actual library file, so
7parallel builds could run into a race and break.
8
9Upstream-Status: Backport
10
11Signed-off-by: Jean Delvare <jdelvare@suse.de>
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13---
14 lib/Module.mk | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/lib/Module.mk b/lib/Module.mk
18index 432a051..fd2c8c4 100644
19--- a/lib/Module.mk
20+++ b/lib/Module.mk
21@@ -42,11 +42,11 @@ endif
22 $(LIB_DIR)/$(LIB_SHLIBNAME): $(LIB_DIR)/smbus.o
23 $(CC) -shared $(LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libi2c.map -Wl,-soname,$(LIB_SHSONAME) -o $@ $^ -lc
24
25-$(LIB_DIR)/$(LIB_SHSONAME):
26+$(LIB_DIR)/$(LIB_SHSONAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
27 $(RM) $@
28 $(LN) $(LIB_SHLIBNAME) $@
29
30-$(LIB_DIR)/$(LIB_SHBASENAME):
31+$(LIB_DIR)/$(LIB_SHBASENAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
32 $(RM) $@
33 $(LN) $(LIB_SHLIBNAME) $@
34
35--
362.4.0
37
diff --git a/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch b/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
deleted file mode 100644
index 33cf2d42a8..0000000000
--- a/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1From 08b0d67ba7eceb862cb17f52eb1911e9579726ea Mon Sep 17 00:00:00 2001
2From: Jean Delvare <jdelvare@suse.de>
3Date: Thu, 14 Dec 2017 08:52:26 +0100
4Subject: [PATCH] tools/Module.mk: Add missing dependencies
5
6Better build the library before building the tools which link against
7it, otherwise parallel builds could run into a race and break.
8
9Upstream-Status: Backport
10
11Signed-off-by: Jean Delvare <jdelvare@suse.de>
12Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com>
13Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com>
14Signed-off-by: Maxin B. John <maxin.john@intel.com>
15---
16 lib/Module.mk | 7 +++++++
17 tools/Module.mk | 10 +++++-----
18 2 files changed, 12 insertions(+), 5 deletions(-)
19
20Index: i2c-tools-4.0/lib/Module.mk
21===================================================================
22--- i2c-tools-4.0.orig/lib/Module.mk
23+++ i2c-tools-4.0/lib/Module.mk
24@@ -35,6 +35,13 @@ LIB_TARGETS += $(LIB_STLIBNAME)
25 LIB_OBJECTS += smbus.ao
26 endif
27
28+# Library file to link against (static or dynamic)
29+ifeq ($(USE_STATIC_LIB),1)
30+LIB_DEPS := $(LIB_DIR)/$(LIB_STLIBNAME)
31+else
32+LIB_DEPS := $(LIB_DIR)/$(LIB_SHBASENAME)
33+endif
34+
35 #
36 # Libraries
37 #
38Index: i2c-tools-4.0/tools/Module.mk
39===================================================================
40--- i2c-tools-4.0.orig/tools/Module.mk
41+++ i2c-tools-4.0/tools/Module.mk
42@@ -24,19 +24,19 @@ TOOLS_TARGETS := i2cdetect i2cdump i2cse
43 # Programs
44 #
45
46-$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o
47+$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o $(LIB_DEPS)
48 $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
49
50-$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
51+$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
52 $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
53
54-$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
55+$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
56 $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
57
58-$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
59+$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
60 $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
61
62-$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
63+$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
64 $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
65
66 #
diff --git a/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch b/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch
deleted file mode 100644
index 703688d08a..0000000000
--- a/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch
+++ /dev/null
@@ -1,98 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 226bc03acca44cf4b300597308064c44676b6f4b Mon Sep 17 00:00:00 2001
5From: Jean Delvare <jdelvare@suse.de>
6Date: Tue, 23 Jan 2018 14:24:16 +0100
7Subject: Delete duplicate i2c-dev.h
8
9The <linux/i2c-dev.h> header file is provided by the kernel, so drop
10our own copy of this file.
11
12Signed-off-by: Jean Delvare <jdelvare@suse.de>
13Acked-by: Wolfram Sang <wsa@the-dreams.de>
14---
15 include/linux/i2c-dev.h | 72 -------------------------------------------------
16 1 file changed, 72 deletions(-)
17 delete mode 100644 include/linux/i2c-dev.h
18
19diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h
20deleted file mode 100644
21index 839d25a..0000000
22--- a/include/linux/i2c-dev.h
23+++ /dev/null
24@@ -1,72 +0,0 @@
25-/*
26- i2c-dev.h - i2c-bus driver, char device interface
27-
28- Copyright (C) 1995-97 Simon G. Vogl
29- Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
30-
31- This program is free software; you can redistribute it and/or modify
32- it under the terms of the GNU General Public License as published by
33- the Free Software Foundation; either version 2 of the License, or
34- (at your option) any later version.
35-
36- This program is distributed in the hope that it will be useful,
37- but WITHOUT ANY WARRANTY; without even the implied warranty of
38- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
39- GNU General Public License for more details.
40-
41- You should have received a copy of the GNU General Public License
42- along with this program; if not, write to the Free Software
43- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
44- MA 02110-1301 USA.
45-*/
46-
47-#ifndef _LINUX_I2C_DEV_H
48-#define _LINUX_I2C_DEV_H
49-
50-#include <linux/types.h>
51-
52-
53-/* /dev/i2c-X ioctl commands. The ioctl's parameter is always an
54- * unsigned long, except for:
55- * - I2C_FUNCS, takes pointer to an unsigned long
56- * - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data
57- * - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data
58- */
59-#define I2C_RETRIES 0x0701 /* number of times a device address should
60- be polled when not acknowledging */
61-#define I2C_TIMEOUT 0x0702 /* set timeout in units of 10 ms */
62-
63-/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses
64- * are NOT supported! (due to code brokenness)
65- */
66-#define I2C_SLAVE 0x0703 /* Use this slave address */
67-#define I2C_SLAVE_FORCE 0x0706 /* Use this slave address, even if it
68- is already in use by a driver! */
69-#define I2C_TENBIT 0x0704 /* 0 for 7 bit addrs, != 0 for 10 bit */
70-
71-#define I2C_FUNCS 0x0705 /* Get the adapter functionality mask */
72-
73-#define I2C_RDWR 0x0707 /* Combined R/W transfer (one STOP only) */
74-
75-#define I2C_PEC 0x0708 /* != 0 to use PEC with SMBus */
76-#define I2C_SMBUS 0x0720 /* SMBus transfer */
77-
78-
79-/* This is the structure as used in the I2C_SMBUS ioctl call */
80-struct i2c_smbus_ioctl_data {
81- __u8 read_write;
82- __u8 command;
83- __u32 size;
84- union i2c_smbus_data *data;
85-};
86-
87-/* This is the structure as used in the I2C_RDWR ioctl call */
88-struct i2c_rdwr_ioctl_data {
89- struct i2c_msg *msgs; /* pointers to i2c_msgs */
90- __u32 nmsgs; /* number of i2c_msgs */
91-};
92-
93-#define I2C_RDRW_IOCTL_MAX_MSGS 42
94-
95-
96-#endif /* _LINUX_I2C_DEV_H */
97--
98cgit v1.1
diff --git a/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb b/meta/recipes-devtools/i2c-tools/i2c-tools_4.1.bb
index fe3247d82e..2b4563d4f0 100644
--- a/meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb
+++ b/meta/recipes-devtools/i2c-tools/i2c-tools_4.1.bb
@@ -5,14 +5,10 @@ LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6 6
7SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/${BP}.tar.gz \ 7SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/${BP}.tar.gz \
8 file://0001-lib-Module.mk-Add-missing-dependencies.patch \
9 file://0001-tools-Module.mk-Add-missing-dependencies.patch \
10 file://0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch \
11 file://remove-i2c-dev.patch \
12" 8"
13 9
14SRC_URI[md5sum] = "d92a288d70f306d3895e3a7e9c14c9aa" 10SRC_URI[md5sum] = "3536237a6b51fb10caacdc3b8a496237"
15SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f2054bb39f19961d67e0c91610f071ca403" 11SRC_URI[sha256sum] = "ef8f77afc70e7dbfd1171bfeae87a8a7f10074829370ce8d9ccd585a014e0073"
16 12
17inherit update-alternatives 13inherit update-alternatives
18 14
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 03:52:37 +0000