i2c-tools: upgrade to 4.0
PATCH v3 1/1 i2c-tools: upgrade to 4.0
Update the SRC_URI to point to kernel.org location where i2c-tools is hosted these days.
Remove Modules.mk since it was used for deprecated binaries (eepromer, eeprom)
Added the following patches to fix races during build:
a) 0001-tools-Module.mk-Add-missing-dependencies.patch
b) 0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
c) 0001-lib-Module.mk-Add-missing-dependencies.patch
Signed-off-by Maxin B. John <[email protected]>
---
...s-eeprog-Module.mk-Add-missing-dependency.patch | 31 ++++++++++
...01-lib-Module.mk-Add-missing-dependencies.patch | 36 +++++++++++
...-tools-Module.mk-Add-missing-dependencies.patch | 69 +++++++++++++++++++++
meta/recipes-devtools/i2c-tools/files/Module.mk | 72 ----------------------
.../{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} | 21 ++++---
5 files changed, 148 insertions(+), 81 deletions(-)
create mode 100644 meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch
create mode 100644 meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch
create mode 100644 meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
delete mode 100644 meta/recipes-devtools/i2c-tools/files/Module.mk
rename meta/recipes-devtools/i2c-tools/{i2c-tools_3.1.2.bb => i2c-tools_4.0.bb} (52%)meta/recipes-devtools/i2c-tools/files/0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 01674fefe3bd24fd93412fbb3eb4e85fe70c80aa Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <[email protected]> +Date: Mon, 18 Dec 2017 16:01:39 +0200 +Subject: [PATCH] i2c-tools: eeprog/Module.mk: Add missing dependency + +Absence of this dependency caused parallel build to run into a race +and break. + +Upstream-Status: Submitted [ https://marc.info/?l=linux-i2c&m=151360627824942&w=2 ] + +Signed-off-by: Maxin B. John <[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.4.0 +
meta/recipes-devtools/i2c-tools/files/0001-lib-Module.mk-Add-missing-dependencies.patch new file +36 -0
@@ -0,0 +1,36 @@ +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. + +Upstream-Status: Backport + +Signed-off-by: Maxin B. John <[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.4.0 +
meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch new file +69 -0
69 lines not on this page · raw message
meta/recipes-devtools/i2c-tools/files/Module.mk deleted +0 -72
72 lines not on this page · raw message
meta/recipes-devtools/i2c-tools/i2c-tools_4.0.bb renamed from meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb +12 -9
@@ -4,20 +4,20 @@ SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.bz2 \ - file://Module.mk \ +SRC_URI = "${KERNELORG_MIRROR}/software/utils/i2c-tools/${BP}.tar.gz \ + file://0001-lib-Module.mk-Add-missing-dependencies.patch \ + file://0001-tools-Module.mk-Add-missing-dependencies.patch \ + file://0001-i2c-tools-eeprog-Module.mk-Add-missing-dependency.patch \ " -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/i/i2c-tools/" -UPSTREAM_CHECK_REGEX = "i2c-tools_(?P<pver>.+)\.orig" -SRC_URI[md5sum] = "7104a1043d11a5e2c7b131614eb1b962" -SRC_URI[sha256sum] = "db5e69f2e2a6e3aa2ecdfe6a5f490b149c504468770f58921c8c5b8a7860a441" + +SRC_URI[md5sum] = "d92a288d70f306d3895e3a7e9c14c9aa" +SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f2054bb39f19961d67e0c91610f071ca403" inherit autotools-brokensep do_compile_prepend() { - cp ${WORKDIR}/Module.mk ${S}/eepromer/ sed -i 's#/usr/local#/usr#' ${S}/Makefile - echo "include eepromer/Module.mk" >> ${S}/Makefile + echo "include eeprog/Module.mk" >> ${S}/Makefile } do_install_append() {
@@ -33,4 +33,7 @@ FILES_${PN}-misc = "${sbindir}/i2c-stub-from-dump \ ${bindir}/decode-dimms \ ${bindir}/decode-vaio \ " -RDEPENDS_${PN}-misc = "${PN} perl" +RDEPENDS_${PN}-misc = "${PN} perl perl-module-posix \ + perl-module-constant perl-module-file-basename \ + perl-module-fcntl perl-module-strict perl-module-vars \ + "
Signature · 1 line
2.4.0