From patchwork Wed May 14 23:38:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary.robertson@linaro.org X-Patchwork-Id: 30210 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B744420446 for ; Wed, 14 May 2014 23:45:33 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id rp18sf1635010iec.5 for ; Wed, 14 May 2014 16:45:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=CxkGvna8kNl4dQXeGuVPPkFxAe8MXzn4kBdt/r4d6rE=; b=kl+3JtAMSPUZWlyV/thYHiA8qrxPq4P4Pl+SOhAu+Pbp7hgqPNTpuaWPiqtSmOcV6B UBj3gyYSqXERnlMSk1uS7R4iE/NZjR33ZdfvmglfS+Cq5ovXIlPlv2yis41uDtWcKDrh EHT8lgwOWiOLQo5gTcdWL6d8qaL3n7j8SU7dfXaI6Qzo9gCEQn8vZP7cDUD1Di1B+dZ/ 9API2oxLR3VLgnnNMBXQ5/OU6cwu0Qeu/m5o6jsFtyvI8bKfQn57IF86xVziXCXWyFVV uKTL8BqIwwHr18HUKuVXpUGec52n8QYhOE5Fs/kPUy1ORKIj/nIf3Mqd7sc+gnw3YSNN 5PeA== X-Gm-Message-State: ALoCoQnkVSaJpmo31z2JaI41NOZMDrlXNzyLxZmhk/UOH4ZlyZAZDRVXhNLaO4FAgIBIP2NBR7Sh X-Received: by 10.182.91.79 with SMTP id cc15mr3428964obb.13.1400111132818; Wed, 14 May 2014 16:45:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.118 with SMTP id f109ls1909qge.8.gmail; Wed, 14 May 2014 16:45:32 -0700 (PDT) X-Received: by 10.58.186.207 with SMTP id fm15mr5406935vec.4.1400111132730; Wed, 14 May 2014 16:45:32 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id at8si592238vec.145.2014.05.14.16.45.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 May 2014 16:45:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id sa20so359887veb.37 for ; Wed, 14 May 2014 16:45:32 -0700 (PDT) X-Received: by 10.52.248.41 with SMTP id yj9mr4570787vdc.22.1400111132568; Wed, 14 May 2014 16:45:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp279181vcb; Wed, 14 May 2014 16:45:32 -0700 (PDT) X-Received: by 10.66.192.73 with SMTP id he9mr8126407pac.88.1400111131745; Wed, 14 May 2014 16:45:31 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id qh4si142206pbb.137.2014.05.14.16.45.31 for ; Wed, 14 May 2014 16:45:31 -0700 (PDT) Received-SPF: none (google.com: openembedded-core-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BBF21660E1; Wed, 14 May 2014 23:45:27 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org X-Greylist: delayed 354 seconds by postgrey-1.34 at layers.openembedded.org; Wed, 14 May 2014 23:45:25 UTC Received: from mail-ob0-f181.google.com (unknown [209.85.214.181]) by mail.openembedded.org (Postfix) with ESMTP id 1352865FE5 for ; Wed, 14 May 2014 23:45:25 +0000 (UTC) Received: by mail-ob0-f181.google.com with SMTP id wm4so334906obc.40 for ; Wed, 14 May 2014 16:45:26 -0700 (PDT) X-Received: by 10.60.115.202 with SMTP id jq10mr6711461oeb.0.1400110772311; Wed, 14 May 2014 16:39:32 -0700 (PDT) Received: from honkintosh.cybertech.lan (65-120-133-114.dia.static.qwest.net. [65.120.133.114]) by mx.google.com with ESMTPSA id to6sm5877102obb.6.2014.05.14.16.39.31 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 May 2014 16:39:31 -0700 (PDT) From: "Gary S. Robertson" To: openembedded-core@lists.openembedded.org Date: Wed, 14 May 2014 18:38:41 -0500 Message-Id: <1400110721-23181-1-git-send-email-gary.robertson@linaro.org> X-Mailer: git-send-email 1.7.9.5 Cc: mike.holmes@linaro.org Subject: [OE-core] [PATCH] rt-tests: restore erroneously deleted patch files X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: gary.robertson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Gary S. Robertson" Commit "rt-tests: bump version 0.87 => 0.89" (SHA1 ID: 7996ca) erroneously deleted several patch files which were still required for proper function of the rt-tests recipe. These missing patches adversely affected builds of the hwlatdetect and hackbench utilities as well as other components. This commit restores the missing patches and allows the recipe to properly generate all the components once more. hwlatdetect and hackbench are built properly and the /usr/src/backfire directory is properly populated on the target system. Signed-off-by: Gary S. Robertson --- ...1-rt-tests-Allow-for-user-specified-PYLIB.patch | 35 ++++++++++ ...02-rt-tests-Break-out-install_hwlatdetect.patch | 68 ++++++++++++++++++++ .../files/added-missing-dependencies.patch | 50 ++++++++++++++ meta/recipes-rt/rt-tests/rt-tests.inc | 3 + 4 files changed, 156 insertions(+) create mode 100644 meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch create mode 100644 meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch create mode 100644 meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch diff --git a/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch b/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch new file mode 100644 index 0000000..8b493eb --- /dev/null +++ b/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch @@ -0,0 +1,35 @@ +From 66765522b634952346f1a3ab7d00c7222a1f9361 Mon Sep 17 00:00:00 2001 +Message-Id: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com> +From: Darren Hart +Date: Tue, 11 Sep 2012 15:19:30 -0700 +Subject: [PATCH 1/2] rt-tests: Allow for user-specified PYLIB + +Upstream-Status: Submitted + +Allow users (build systems) to specify PYLIB. This allows for a +cross-build-system to specify the target PYLIB rather than the host +PYLIB. + +Signed-off-by: Darren Hart +CC: Clark Williams +CC: John Kacur +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 3a82407..61e2f9f 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,7 +23,7 @@ endif + CFLAGS ?= -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include + LDFLAGS ?= + +-PYLIB := $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()') ++PYLIB ?= $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()') + + ifndef DEBUG + CFLAGS += -O2 +-- +1.7.11.4 + diff --git a/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch b/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch new file mode 100644 index 0000000..bc6136f --- /dev/null +++ b/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch @@ -0,0 +1,68 @@ +From af93e580d005a2bba6ed36528003af4cf631adb8 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com> +References: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com> +From: Darren Hart +Date: Tue, 11 Sep 2012 14:51:10 -0700 +Subject: [PATCH 2/2] rt-tests: Break out install_hwlatdetect + +Upstream-Status: Submitted + +Allow hwlatdetect to be installed independently of the rest of the +tests. This is convenient for build systems that package it separately +due to the python dependency. + +Signed-off-by: Darren Hart +CC: Clark Williams +CC: John Kacur +--- + Makefile | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 61e2f9f..636e63b 100644 +--- a/Makefile ++++ b/Makefile +@@ -119,21 +119,15 @@ changelog: + git log >ChangeLog + + .PHONY: install +-install: all ++install: all install_hwlatdetect + mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4" + mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8" + cp $(TARGETS) "$(DESTDIR)$(bindir)" +- if test -n "$(PYLIB)" ; then \ +- install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ +- rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ +- fi + install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" + install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" + gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" + gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" + gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" +- gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" + gzip src/ptsematest/ptsematest.8 -c >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" + gzip src/sigwaittest/sigwaittest.8 -c >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" + gzip src/svsematest/svsematest.8 -c >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" +@@ -141,6 +135,16 @@ install: all + gzip src/backfire/sendme.8 -c >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" + gzip src/hackbench/hackbench.8 -c >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" + ++.PHONY: install_hwlatdetect ++install_hwlatdetect: hwlatdetect ++ if test -n "$(PYLIB)" ; then \ ++ mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man8" ; \ ++ install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ ++ rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ ++ ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ ++ gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ ++ fi ++ + .PHONY: release + release: clean changelog + mkdir -p releases +-- +1.7.11.4 + diff --git a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch b/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch new file mode 100644 index 0000000..e420282 --- /dev/null +++ b/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch @@ -0,0 +1,50 @@ +From 82d28701486ba5a699544a168448bf93b1ccd7b1 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Thu, 6 Dec 2012 11:26:14 +0800 +Subject: [PATCH] Added missing dependencies + +Upstream-Status: Submitted [linux-rt-users] + +The following targets missed dependency on librttest.a: +pi_stress +rt-migrate-test +hackbench + +Signed-off-by: Jackie Huang +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index fd3cdb3..60707a7 100644 +--- a/Makefile ++++ b/Makefile +@@ -68,14 +68,14 @@ cyclictest: cyclictest.o librttest.a + signaltest: signaltest.o librttest.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + +-pi_stress: pi_stress.o ++pi_stress: pi_stress.o librttest.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + + hwlatdetect: src/hwlatdetect/hwlatdetect.py + chmod +x src/hwlatdetect/hwlatdetect.py + ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect + +-rt-migrate-test: rt-migrate-test.o ++rt-migrate-test: rt-migrate-test.o librttest.a + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + + ptsematest: ptsematest.o librttest.a +@@ -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.9.5 + diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 954782c..ee5a1af 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -2,6 +2,9 @@ SRCREV = "9164ec4db2645f52ffdd20e6d1b72bb0411ab40e" 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://added-missing-dependencies.patch \ file://hackbench-fix-error-check.patch \ "