i2c-tools: bump to version 4.1

PATCH New Baruch Siach 3 participants 3 messages Dec 11, 2018 – Dec 13, 2018

lore

Share & tools

lore

Baruch Siach

author

2018-12-11 11:52 UTC #0 lore raw

PATCH 1/1 i2c-tools: bump to version 4.1

Drop upstream patches.

Rename 'prefix' to 'PREFIX' following upstream change.

Update README hash for build documentation changes unrelated to license.

Cc Angelo Compagnucci <[email protected]>

Cc Matt Weber <[email protected]>

Signed-off-by Baruch Siach <[email protected]>

---
 ...b-Module.mk-Add-missing-dependencies.patch | 34 ----------
 ...-Add-flag-to-disable-dynamic-library.patch | 64 ------------------
 ....mk-Drop-unused-variable-LIB_OBJECTS.patch | 33 ---------
 ...s-Module.mk-Add-missing-dependencies.patch | 67 -------------------
 ...b-Module.mk-Fix-LIB_LINKS-dependency.patch | 34 ----------
 ...o-really-disable-the-dynamic-library.patch | 33 ---------
 ...rog-Module.mk-Add-missing-dependency.patch | 30 ---------
 ...n-t-install-dynamic-library-when-dis.patch | 41 ------------
 package/i2c-tools/i2c-tools.hash              |  4 +-
 package/i2c-tools/i2c-tools.mk                |  6 +-
 10 files changed, 5 insertions(+), 341 deletions(-)
 delete mode 100644 package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch
 delete mode 100644 package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch
 delete mode 100644 package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch
 delete mode 100644 package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch
 delete mode 100644 package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch
 delete mode 100644 package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch
 delete mode 100644 package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch
 delete mode 100644 package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch

package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch deleted +0 ~~-34~~

deleted file mode 100644
index 09a78dae0ef8..000000000000
@@ -1,34 +0,0 @@
-From a6a59693066fd8da81f7107479df3e32a129247d Mon Sep 17 00:00:00 2001
-From: Jean Delvare <[email protected]>
-Date: Wed, 6 Dec 2017 09:55:04 +0100
-Subject: [PATCH] lib/Module.mk: Add missing dependencies
-
-The lib symlinks lacked a dependency to the actual library file, so
-parallel builds could run into a race and break.
-
-Signed-off-by: Angelo Compagnucci <[email protected]>
----
- lib/Module.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 432a051..fd2c8c4 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -42,11 +42,11 @@ endif
- $(LIB_DIR)/$(LIB_SHLIBNAME): $(LIB_DIR)/smbus.o
- 	$(CC) -shared $(LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libi2c.map -Wl,-soname,$(LIB_SHSONAME) -o $@ $^ -lc
- 
--$(LIB_DIR)/$(LIB_SHSONAME):
-+$(LIB_DIR)/$(LIB_SHSONAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
- 	$(RM) $@
- 	$(LN) $(LIB_SHLIBNAME) $@
- 
--$(LIB_DIR)/$(LIB_SHBASENAME):
-+$(LIB_DIR)/$(LIB_SHBASENAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
- 	$(RM) $@
- 	$(LN) $(LIB_SHLIBNAME) $@
- 
--- 
-2.7.4
-

package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch deleted +0 ~~-64~~

64 lines not on this page · raw message

package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch deleted +0 ~~-33~~

deleted file mode 100644
index 43c915c20032..000000000000
@@ -1,33 +0,0 @@
-From 1831b618fbedf0bcf15b0465981d133d9e3c53ee Mon Sep 17 00:00:00 2001
-From: Jean Delvare <[email protected]>
-Date: Wed, 6 Dec 2017 10:46:56 +0100
-Subject: lib/Module.mk: Drop unused variable LIB_OBJECTS
-
-Signed-off-by: Angelo Compagnucci <[email protected]>
----
- lib/Module.mk | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 44fa938..8a58f5b 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -28,7 +28,6 @@ LIB_SHLIBNAME	:= $(LIB_SHBASENAME).$(LIB_VER)
- LIB_STLIBNAME	:= libi2c.a
- 
- LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
--LIB_OBJECTS	:= smbus.o
- 
- LIB_TARGETS	:=
- ifeq ($(BUILD_DYNAMIC_LIB),1)
-@@ -36,7 +35,6 @@ LIB_TARGETS	+= $(LIB_SHLIBNAME)
- endif
- ifeq ($(BUILD_STATIC_LIB),1)
- LIB_TARGETS	+= $(LIB_STLIBNAME)
--LIB_OBJECTS	+= smbus.ao
- endif
- 
- #
--- 
-2.7.4
-

package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch deleted +0 ~~-67~~

67 lines not on this page · raw message

package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch deleted +0 ~~-34~~

deleted file mode 100644
index 37a8ebc6fde9..000000000000
@@ -1,34 +0,0 @@
-From de278d0933e3caea2508f95fd00e7e338bc12e8f Mon Sep 17 00:00:00 2001
-From: Angelo Compagnucci <[email protected]>
-Date: Thu, 14 Dec 2017 13:34:29 +0100
-Subject: lib/Module.mk: Fix LIB_LINKS dependency
-
-LIB_LINKS should be added as a dependency only when
-BUILD_DYNAMIC_LIB is enabled.
-
-Signed-off-by: Angelo Compagnucci <[email protected]>
-Signed-off-by: Jean Delvare <[email protected]>
-Fixes: 9906b2ecb6ae ("Makefile: Add flag to disable dynamic library"
----
- lib/Module.mk | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 67afe91..2ebc70d 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -27,10 +27,9 @@ LIB_SHSONAME	:= $(LIB_SHBASENAME).$(LIB_MAINVER)
- LIB_SHLIBNAME	:= $(LIB_SHBASENAME).$(LIB_VER)
- LIB_STLIBNAME	:= libi2c.a
- 
--LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
--
- LIB_TARGETS	:=
- ifeq ($(BUILD_DYNAMIC_LIB),1)
-+LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
- LIB_TARGETS	+= $(LIB_SHLIBNAME)
- endif
- ifeq ($(BUILD_STATIC_LIB),1)
--- 
-2.7.4
-

package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch deleted +0 ~~-33~~

deleted file mode 100644
index 85438cbf0199..000000000000
@@ -1,33 +0,0 @@
-From 57d2c370493f2e9e33b30e8767624c648f138ec4 Mon Sep 17 00:00:00 2001
-From: Jean Delvare <[email protected]>
-Date: Thu, 14 Dec 2017 13:34:34 +0100
-Subject: Makefile: Allow to really disable the dynamic library
-
-If the user disables the build of the dynamic library, we have to
-link the tools with the static library. If we don't, the dependencies
-will cause the dynamic library to be built regardless of the user's
-request.
-
-Signed-off-by: Jean Delvare <[email protected]>
-Fixes: 9906b2ecb6ae ("Makefile: Add flag to disable dynamic library")
-Signed-off-by: Angelo Compagnucci <[email protected]>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 1bb5572..6bb741f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -43,6 +43,8 @@ endif
- ifeq ($(BUILD_DYNAMIC_LIB),0)
- ifeq ($(BUILD_STATIC_LIB),0)
- $(error BUILD_DYNAMIC_LIB and BUILD_STATIC_LIB cannot be disabled at the same time)
-+else
-+USE_STATIC_LIB := 1
- endif
- endif
- 
--- 
-2.7.4
-

package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch deleted +0 ~~-30~~

deleted file mode 100644
index 126d38856944..000000000000
@@ -1,30 +0,0 @@
-From f87c97317012a3b96b67237925893b8ffd5f4f50 Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" <[email protected]>
-Date: Tue, 19 Dec 2017 13:46:15 +0100
-Subject: [PATCH] eeprog/Module.mk: Add missing dependency
-
-Absence of this dependency caused parallel build to run into a race
-and break.
-
-Signed-off-by: Maxin B. John <[email protected]>
-Signed-off-by: Jean Delvare <[email protected]>
----
- eeprog/Module.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eeprog/Module.mk b/eeprog/Module.mk
-index 9d36869..d215855 100644
---- a/eeprog/Module.mk
-+++ b/eeprog/Module.mk
-@@ -20,7 +20,7 @@ EEPROG_TARGETS	:= eeprog
- # Programs
- #
- 
--$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o
-+$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o $(LIB_DEPS)
- 	$(CC) $(LDFLAGS) -o $@ $^ $(EEPROG_LDFLAGS)
- 
- #
--- 
-2.7.4
-

package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch deleted +0 ~~-41~~

41 lines not on this page · raw message

package/i2c-tools/i2c-tools.hash +2 -2

index 37563074fc2b..280a139c00dd 100644
@@ -1,7 +1,7 @@
 # Locally computed
-sha256 d900ca1c11c51ea20caa50b096f948008b8a7ad832311b23353e21baa7af28d6  i2c-tools-4.0.tar.xz
+sha256 57b219efd183795bd545dd5a60d9eabbe9dcb6f8fb92bc7ba2122b87f98527d5  i2c-tools-4.1.tar.xz
 
 # License files
 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPL
-sha256 158abc6886c2c6e2dec7e9cb11b46fd41cb13a015c5057c2a587ef581f9142f8  README
+sha256 b75b04b46320dff5e2b50a9c69b8e526b7db5087083ea3ba65533f08fc11b9f0  README

package/i2c-tools/i2c-tools.mk +3 -3

index 11d0cf980819..d4d9c012fa87 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-I2C_TOOLS_VERSION = 4.0
+I2C_TOOLS_VERSION = 4.1
 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)

@@ -59,13 +59,13 @@ endef
 
 define I2C_TOOLS_INSTALL_TARGET_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) \
-		DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install
+		DESTDIR="$(TARGET_DIR)" PREFIX=/usr -C $(@D) install
 	$(I2C_TOOLS_INSTALL_PYSMBUS)
 endef
 
 define I2C_TOOLS_INSTALL_STAGING_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) \
-		DESTDIR="$(STAGING_DIR)" prefix=/usr -C $(@D) install
+		DESTDIR="$(STAGING_DIR)" PREFIX=/usr -C $(@D) install
 endef
 
 $(eval $(generic-package))

Signature · 1 line

2.19.2

Arnout Vandecappelle

2018-12-11 12:56 UTC #1 lore raw

PATCH 1/1 i2c-tools: bump to version 4.1

Quoted 5 lines · Baruch Siach

Drop upstream patches.
Rename 'prefix' to 'PREFIX' following upstream change.
Update README hash for build documentation changes unrelated to license.

Actually, IMO the text in README is not that valuable:

Check the documentation of individual tools for licensing information. The library is released under the LGPL version 2.1 or later, while most tools are released under the GPL version 2 or later, but there are a few exceptions.

This adds nothing to the license info we have already...

But that's a separate patch anyway, so

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

BTW, most changes in this release are bugfixes, but I think we already had all
of those as patches; the feature changes are
7028042 tools: add all_addrs option for i2c tools
and a bunch of commits to add DDR4 support to decode-dimms.

Since the bugfixes are already in the stable branches, this is not for stable.

Regards,
Arnout

Quoted 4 lines

Cc Angelo Compagnucci <[email protected]>
Cc Matt Weber <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

Thomas Petazzoni

Applied

2018-12-13 21:09 UTC #2 lore raw

PATCH 1/1 i2c-tools: bump to version 4.1

In reply to Baruch Siach

Hello,

Quoted 21 lines · Baruch Siach

Drop upstream patches.

Rename 'prefix' to 'PREFIX' following upstream change.

Update README hash for build documentation changes unrelated to license.

Cc Angelo Compagnucci <[email protected]>

Cc Matt Weber <[email protected]>

Signed-off-by Baruch Siach <[email protected]>

---
 ...b-Module.mk-Add-missing-dependencies.patch | 34 ----------
 ...-Add-flag-to-disable-dynamic-library.patch | 64 ------------------
 ....mk-Drop-unused-variable-LIB_OBJECTS.patch | 33 ---------
 ...s-Module.mk-Add-missing-dependencies.patch | 67 -------------------
 ...b-Module.mk-Fix-LIB_LINKS-dependency.patch | 34 ----------
 ...o-really-disable-the-dynamic-library.patch | 33 ---------
 ...rog-Module.mk-Add-missing-dependency.patch | 30 ---------
 ...n-t-install-dynamic-library-when-dis.patch | 41 ------------
 package/i2c-tools/i2c-tools.hash              |  4 +-
 package/i2c-tools/i2c-tools.mk                |  6 +-
 10 files changed, 5 insertions(+), 341 deletions(-)

Quoted 8 lines

 delete mode 100644 package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch
 delete mode 100644 package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch
 delete mode 100644 package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch
 delete mode 100644 package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch
 delete mode 100644 package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch
 delete mode 100644 package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch
 delete mode 100644 package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch
 delete mode 100644 package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com