mirror of
https://git.yoctoproject.org/poky
synced 2026-02-24 02:19:39 +01:00
0797aab859
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)
Backported 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
(From OE-Core rev: f330e9f64b69de09284da765ca1e869099ec49ae)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
70 lines
2.5 KiB
Diff
70 lines
2.5 KiB
Diff
From 08b0d67ba7eceb862cb17f52eb1911e9579726ea Mon Sep 17 00:00:00 2001
|
|
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.
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com>
|
|
Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com>
|
|
Signed-off-by: Maxin B. John <maxin.john@intel.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 8a58f5b..67afe91 100644
|
|
--- a/lib/Module.mk
|
|
+++ b/lib/Module.mk
|
|
@@ -37,6 +37,13 @@ ifeq ($(BUILD_STATIC_LIB),1)
|
|
LIB_TARGETS += $(LIB_STLIBNAME)
|
|
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 6421a23..609de7a 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)
|
|
|
|
#
|
|
--
|
|
2.4.0
|
|
|