Patchwork rt-tests: add missing build dependencies

login
mail settings
Submitter Ross Burton
Date Dec. 7, 2012, 12:02 p.m.
Message ID <1354881744-1827-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/40645/
State New
Headers show

Comments

Ross Burton - Dec. 7, 2012, 12:02 p.m.
hackbench links to but doesn't depend on librttest.a, so parallel builds can
randomly fail.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...d-missing-build-dependencies-to-hackbench.patch |   32 ++++++++++++++++++++
 meta/recipes-rt/rt-tests/rt-tests.inc              |    5 +--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-rt/rt-tests/files/0001-Add-missing-build-dependencies-to-hackbench.patch
Ross Burton - Dec. 7, 2012, 12:52 p.m.
On 7 December 2012 12:02, Ross Burton <ross.burton@intel.com> wrote:
> hackbench links to but doesn't depend on librttest.a, so parallel builds can
> randomly fail.

Retracting this, I was beaten to it by a few hours.

Ross

Patch

diff --git a/meta/recipes-rt/rt-tests/files/0001-Add-missing-build-dependencies-to-hackbench.patch b/meta/recipes-rt/rt-tests/files/0001-Add-missing-build-dependencies-to-hackbench.patch
new file mode 100644
index 0000000..c4d221d
--- /dev/null
+++ b/meta/recipes-rt/rt-tests/files/0001-Add-missing-build-dependencies-to-hackbench.patch
@@ -0,0 +1,32 @@ 
+Upstream-Status: Submitted [email]
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From 640aea5bd51ea380d299df16cb90b290a0b54ac9 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@intel.com>
+Date: Fri, 7 Dec 2012 11:58:12 +0000
+Subject: [PATCH] Add missing build dependencies to hackbench
+
+hackbench links to librttest.a but doesn't depend on it, so building it
+explicitly or in parallel builds this can fail.
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index fd3cdb3..95030d9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -96,7 +96,7 @@ sendme: sendme.o librttest.a
+ pip_stress: pip_stress.o librttest.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+-hackbench: hackbench.o
++hackbench: hackbench.o librttest.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ librttest.a: rt-utils.o error.o rt-get_cpu.o
+-- 
+1.7.10
+
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 6a699fc..9cc1638 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -5,9 +5,10 @@  PR = "r0"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git \
            file://0001-rt-tests-Allow-for-user-specified-PYLIB.patch \
-           file://0002-rt-tests-Break-out-install_hwlatdetect.patch"
+           file://0002-rt-tests-Break-out-install_hwlatdetect.patch \
+           file://0001-Add-missing-build-dependencies-to-hackbench.patch"
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 S = "${WORKDIR}/git"