Thanks, applied as e3d77d5195fe8d50662152df16771e7793b9c8b0. Michael
[sent from post-receive hook] On Mon, 03 Aug 2020 08:30:09 +0200, Robert Schwebel <[email protected]> wrote: > 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 cb8908802a50..000000000000 > --- a/patches/i2c-tools-4.0/0001-lib-Module.mk-Add-missing-dependencies.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -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. > ---- > - 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 c4d5b9bda1d0..000000000000 > --- > a/patches/i2c-tools-4.0/0002-tools-Module.mk-Add-missing-dependencies.patch > +++ /dev/null > @@ -1,62 +0,0 @@ > -From: Jean Delvare <[email protected]> > -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 <[email protected]> > -Tested-by: Angelo Compagnucci <[email protected]> > -Acked-by: Angelo Compagnucci <[email protected]> > ---- > - 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 902b5d7754a4..000000000000 > --- a/patches/i2c-tools-4.0/0003-eeprog-Module.mk-Add-missing-dependency.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -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 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 e3baaaea2fbf..000000000000 > --- 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 9a409deed8cc..9100c8a955b6 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 > _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
