From bcb539788c6e8eaa22f0a4317b139756c81130a947e27c3d6d6137ec1130a71b Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 14 Dec 2017 08:07:14 +0000 Subject: [PATCH] - Rename patches for consistency - Add upstream reference OBS-URL: https://build.opensuse.org/package/show/Base:System/i2c-tools?expand=0&rev=49 --- ...ndencies.patch => build-lib-add-missing-dependencies.patch | 0 ...encies.patch => build-tools-add-missing-dependencies.patch | 3 +++ i2c-tools.changes | 4 ++-- i2c-tools.spec | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) rename lib-build-add-missing-dependencies.patch => build-lib-add-missing-dependencies.patch (100%) rename tools-build-add-missing-dependencies.patch => build-tools-add-missing-dependencies.patch (94%) diff --git a/lib-build-add-missing-dependencies.patch b/build-lib-add-missing-dependencies.patch similarity index 100% rename from lib-build-add-missing-dependencies.patch rename to build-lib-add-missing-dependencies.patch diff --git a/tools-build-add-missing-dependencies.patch b/build-tools-add-missing-dependencies.patch similarity index 94% rename from tools-build-add-missing-dependencies.patch rename to build-tools-add-missing-dependencies.patch index 417158b..0157677 100644 --- a/tools-build-add-missing-dependencies.patch +++ b/build-tools-add-missing-dependencies.patch @@ -1,5 +1,8 @@ From: Jean Delvare +Date: Thu, 14 Dec 2017 08:52:26 +0100 Subject: tools/Module.mk: Add missing dependencies +Patch-mainline: yes +Git-commit: 08b0d67ba7eceb862cb17f52eb1911e9579726ea Better build the library before building the tools which link against it, otherwise parallel builds could run into a race and break. diff --git a/i2c-tools.changes b/i2c-tools.changes index fbab03a..9e1e7c3 100644 --- a/i2c-tools.changes +++ b/i2c-tools.changes @@ -1,13 +1,13 @@ ------------------------------------------------------------------- Tue Dec 12 17:07:54 CET 2017 - jdelvare@suse.com -- tools-build-add-missing-dependencies.patch: Fix another random +- build-tools-add-missing-dependencies.patch: Fix another random failure of parallel builds. ------------------------------------------------------------------- Wed Dec 6 16:01:02 CET 2017 - jdelvare@suse.com -- lib-build-add-missing-dependencies.patch: Fix random failure +- build-lib-add-missing-dependencies.patch: Fix random failure of parallel builds. - decode-dimms-hackweek-DDR4.patch: Add DDR4 SDRAM memory support to decode-dimms (Hackweek 0x10 project.) diff --git a/i2c-tools.spec b/i2c-tools.spec index cae8da3..ca96d90 100644 --- a/i2c-tools.spec +++ b/i2c-tools.spec @@ -28,9 +28,9 @@ Url: https://i2c.wiki.kernel.org/index.php/I2C_Tools Source0: https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.xz Source1: https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.sign Patch1: i2cbusses-path-overflows.patch -Patch2: lib-build-add-missing-dependencies.patch +Patch2: build-lib-add-missing-dependencies.patch Patch3: decode-dimms-hackweek-DDR4.patch -Patch4: tools-build-add-missing-dependencies.patch +Patch4: build-tools-add-missing-dependencies.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x