From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 06/13] i2c-tools: version bump 4.0 -> 4.1
Date: Sun, 26 Jul 2020 16:24:29 +0200 [thread overview]
Message-ID: <20200726142436.3113607-6-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <20200726142436.3113607-1-r.schwebel@pengutronix.de>
The patches can be removed, as they were all backports from upstream and
are applied in the meantime.
Makefile has changed slightly, adapt the rules.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...b-Module.mk-Add-missing-dependencies.patch | 28 ---------
...s-Module.mk-Add-missing-dependencies.patch | 62 -------------------
...rog-Module.mk-Add-missing-dependency.patch | 26 --------
patches/i2c-tools-4.0/series | 6 --
rules/i2c-tools.make | 10 +--
5 files changed, 6 insertions(+), 126 deletions(-)
delete mode 100644 patches/i2c-tools-4.0/0001-lib-Module.mk-Add-missing-dependencies.patch
delete mode 100644 patches/i2c-tools-4.0/0002-tools-Module.mk-Add-missing-dependencies.patch
delete mode 100644 patches/i2c-tools-4.0/0003-eeprog-Module.mk-Add-missing-dependency.patch
delete mode 100644 patches/i2c-tools-4.0/series
diff --git a/patches/i2c-tools-4.0/0001-lib-Module.mk-Add-missing-dependencies.patch b/patches/i2c-tools-4.0/0001-lib-Module.mk-Add-missing-dependencies.patch
deleted file mode 100644
index cb8908802..000000000
--- a/patches/i2c-tools-4.0/0001-lib-Module.mk-Add-missing-dependencies.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jean Delvare <jdelvare@suse.de>
-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.
----
- lib/Module.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 432a0518fc54..fd2c8c4e59f5 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) $@
-
diff --git a/patches/i2c-tools-4.0/0002-tools-Module.mk-Add-missing-dependencies.patch b/patches/i2c-tools-4.0/0002-tools-Module.mk-Add-missing-dependencies.patch
deleted file mode 100644
index c4d5b9bda..000000000
--- a/patches/i2c-tools-4.0/0002-tools-Module.mk-Add-missing-dependencies.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Jean Delvare <jdelvare@suse.de>
-Date: Thu, 14 Dec 2017 08:52:26 +0100
-Subject: [PATCH] tools/Module.mk: Add missing dependencies
-
-Better build the library before building the tools which link against
-it, otherwise parallel builds could run into a race and break.
-
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
-Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com>
-Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com>
----
- lib/Module.mk | 7 +++++++
- tools/Module.mk | 10 +++++-----
- 2 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/lib/Module.mk b/lib/Module.mk
-index fd2c8c4e59f5..92aba30131f0 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -35,6 +35,13 @@ LIB_TARGETS += $(LIB_STLIBNAME)
- LIB_OBJECTS += smbus.ao
- endif
-
-+# Library file to link against (static or dynamic)
-+ifeq ($(USE_STATIC_LIB),1)
-+LIB_DEPS := $(LIB_DIR)/$(LIB_STLIBNAME)
-+else
-+LIB_DEPS := $(LIB_DIR)/$(LIB_SHBASENAME)
-+endif
-+
- #
- # Libraries
- #
-diff --git a/tools/Module.mk b/tools/Module.mk
-index 6421a23883bf..609de7a24784 100644
---- a/tools/Module.mk
-+++ b/tools/Module.mk
-@@ -24,19 +24,19 @@ TOOLS_TARGETS := i2cdetect i2cdump i2cset i2cget i2ctransfer
- # Programs
- #
-
--$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o
-+$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o $(LIB_DEPS)
- $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
-
--$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
-+$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
- $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
-
--$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
-+$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
- $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
-
--$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
-+$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
- $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
-
--$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
-+$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
- $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
-
- #
diff --git a/patches/i2c-tools-4.0/0003-eeprog-Module.mk-Add-missing-dependency.patch b/patches/i2c-tools-4.0/0003-eeprog-Module.mk-Add-missing-dependency.patch
deleted file mode 100644
index 902b5d775..000000000
--- a/patches/i2c-tools-4.0/0003-eeprog-Module.mk-Add-missing-dependency.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: "Maxin B. John" <maxin.john@gmail.com>
-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 <maxin.john@intel.com>
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
----
- eeprog/Module.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/eeprog/Module.mk b/eeprog/Module.mk
-index 9d368698c6a5..d2158555ab76 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)
-
- #
diff --git a/patches/i2c-tools-4.0/series b/patches/i2c-tools-4.0/series
deleted file mode 100644
index e3baaaea2..000000000
--- a/patches/i2c-tools-4.0/series
+++ /dev/null
@@ -1,6 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-lib-Module.mk-Add-missing-dependencies.patch
-0002-tools-Module.mk-Add-missing-dependencies.patch
-0003-eeprog-Module.mk-Add-missing-dependency.patch
-# 17489d574df925f551430e5937f3baa9 - git-ptx-patches magic
diff --git a/rules/i2c-tools.make b/rules/i2c-tools.make
index 9a409deed..9100c8a95 100644
--- a/rules/i2c-tools.make
+++ b/rules/i2c-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_I2C_TOOLS) += i2c-tools
#
# Paths and names
#
-I2C_TOOLS_VERSION := 4.0
-I2C_TOOLS_MD5 := f873c657d00bc00e9c47ed938c2cd770
+I2C_TOOLS_VERSION := 4.1
+I2C_TOOLS_MD5 := e2981debb4a822a279be7e45a0ede988
I2C_TOOLS := i2c-tools-$(I2C_TOOLS_VERSION)
I2C_TOOLS_SUFFIX := tar.xz
I2C_TOOLS_URL := https://www.kernel.org/pub/software/utils/i2c-tools/$(I2C_TOOLS).$(I2C_TOOLS_SUFFIX)
@@ -31,12 +31,14 @@ I2C_TOOLS_CONF_TOOL := NO
I2C_TOOLS_MAKE_ENV := \
$(CROSS_ENV) \
- BUILD_STATIC_LIB=0
+ BUILD_STATIC_LIB=0 \
+ BUILD_DYNAMIC_LIB=1 \
+ USE_DYNAMIC_LIB=1
# install the header files to include/i2c-tools
# this way they don't collide with the toolchain's i2c headers
I2C_TOOLS_INSTALL_OPT := \
- prefix=/usr \
+ PREFIX=/usr \
incdir=/usr/include/i2c-tools \
install
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2020-07-26 14:24 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-26 14:24 [ptxdist] [PATCH 01/13] ncurses: version bump 6.1 -> 6.2 Robert Schwebel
2020-07-26 14:24 ` [ptxdist] [PATCH 02/13] openssh: version bump 8.0p1 -> 8.3p1 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 03/13] libndp: version bump 1.6 -> 1.7 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 04/13] haveged: version bump 1.9.8 -> 1.9.13 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 05/13] less: version bump 487 -> 530 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` Robert Schwebel [this message]
2020-08-03 6:30 ` [ptxdist] [APPLIED] i2c-tools: version bump 4.0 -> 4.1 Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 07/13] libseccomp: version bump 2.4.3 -> 2.5.0 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 08/13] readline: version bump 7.0 -> 8.0 Robert Schwebel
2020-07-27 9:05 ` Roland Hieber
2020-07-27 10:02 ` [ptxdist] [PATCH 1/6] " Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 09/13] procps: version bump 3.3.15 -> 3.3.16 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 10/13] strace: version bump 5.4 -> 5.7 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 11/13] pciutils: version bump 3.6.2 -> 3.7.0 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-26 14:24 ` [ptxdist] [PATCH 12/13] util-linux-nt: version bump 2.35.2 -> 2.36 Robert Schwebel
2020-07-30 13:41 ` Michael Olbrich
2020-07-30 14:56 ` [ptxdist] [PATCHv2] util-linux-ng: " Robert Schwebel
2020-07-31 5:00 ` Michael Olbrich
2020-07-31 5:43 ` [ptxdist] [PATCHv3] " Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-07-31 5:43 ` [ptxdist] [PATCHv2] " Robert Schwebel
2020-07-26 14:24 ` [ptxdist] [PATCH 13/13] iproute2: version bump 5.6.0 -> 5.7.0 Robert Schwebel
2020-08-03 6:30 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-03 6:30 ` [ptxdist] [APPLIED] ncurses: version bump 6.1 -> 6.2 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200726142436.3113607-6-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox