summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch35
-rw-r--r--meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch68
-rw-r--r--meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch30
-rw-r--r--meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch48
-rw-r--r--meta/recipes-rt/rt-tests/files/hackbench-fix-error-check.patch41
-rw-r--r--meta/recipes-rt/rt-tests/hwlatdetect_0.94.bb (renamed from meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb)0
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests.inc14
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests_0.94.bb (renamed from meta/recipes-rt/rt-tests/rt-tests_0.92.bb)4
8 files changed, 7 insertions, 233 deletions
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
deleted file mode 100644
index 8b493eb1f1..0000000000
--- a/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 66765522b634952346f1a3ab7d00c7222a1f9361 Mon Sep 17 00:00:00 2001
2Message-Id: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com>
3From: Darren Hart <dvhart@linux.intel.com>
4Date: Tue, 11 Sep 2012 15:19:30 -0700
5Subject: [PATCH 1/2] rt-tests: Allow for user-specified PYLIB
6
7Upstream-Status: Submitted
8
9Allow users (build systems) to specify PYLIB. This allows for a
10cross-build-system to specify the target PYLIB rather than the host
11PYLIB.
12
13Signed-off-by: Darren Hart <dvhart@linux.intel.com>
14CC: Clark Williams <williams@redhat.com>
15CC: John Kacur <jkacur@redhat.com>
16---
17 Makefile | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Makefile b/Makefile
21index 3a82407..61e2f9f 100644
22--- a/Makefile
23+++ b/Makefile
24@@ -23,7 +23,7 @@ endif
25 CFLAGS ?= -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
26 LDFLAGS ?=
27
28-PYLIB := $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
29+PYLIB ?= $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
30
31 ifndef DEBUG
32 CFLAGS += -O2
33--
341.7.11.4
35
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
deleted file mode 100644
index bc6136f1de..0000000000
--- a/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From af93e580d005a2bba6ed36528003af4cf631adb8 Mon Sep 17 00:00:00 2001
2Message-Id: <af93e580d005a2bba6ed36528003af4cf631adb8.1347419597.git.dvhart@linux.intel.com>
3In-Reply-To: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com>
4References: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com>
5From: Darren Hart <dvhart@linux.intel.com>
6Date: Tue, 11 Sep 2012 14:51:10 -0700
7Subject: [PATCH 2/2] rt-tests: Break out install_hwlatdetect
8
9Upstream-Status: Submitted
10
11Allow hwlatdetect to be installed independently of the rest of the
12tests. This is convenient for build systems that package it separately
13due to the python dependency.
14
15Signed-off-by: Darren Hart <dvhart@linux.intel.com>
16CC: Clark Williams <williams@redhat.com>
17CC: John Kacur <jkacur@redhat.com>
18---
19 Makefile | 18 +++++++++++-------
20 1 file changed, 11 insertions(+), 7 deletions(-)
21
22diff --git a/Makefile b/Makefile
23index 61e2f9f..636e63b 100644
24--- a/Makefile
25+++ b/Makefile
26@@ -119,21 +119,15 @@ changelog:
27 git log >ChangeLog
28
29 .PHONY: install
30-install: all
31+install: all install_hwlatdetect
32 mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4"
33 mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8"
34 cp $(TARGETS) "$(DESTDIR)$(bindir)"
35- if test -n "$(PYLIB)" ; then \
36- install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
37- rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
38- ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
39- fi
40 install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
41 install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile"
42 gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
43 gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
44 gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
45- gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz"
46 gzip src/ptsematest/ptsematest.8 -c >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
47 gzip src/sigwaittest/sigwaittest.8 -c >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
48 gzip src/svsematest/svsematest.8 -c >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
49@@ -141,6 +135,16 @@ install: all
50 gzip src/backfire/sendme.8 -c >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
51 gzip src/hackbench/hackbench.8 -c >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
52
53+.PHONY: install_hwlatdetect
54+install_hwlatdetect: hwlatdetect
55+ if test -n "$(PYLIB)" ; then \
56+ mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man8" ; \
57+ install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
58+ rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
59+ ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
60+ gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
61+ fi
62+
63 .PHONY: release
64 release: clean changelog
65 mkdir -p releases
66--
671.7.11.4
68
diff --git a/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch b/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch
deleted file mode 100644
index 0a35ddc740..0000000000
--- a/meta/recipes-rt/rt-tests/files/Makefile-fix-gzip-command.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 07b5ed42d7041ccc084889eaa96817aa097bf461 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 3 Feb 2015 03:10:25 +0000
4Subject: [PATCH] Makefile: fix gzip command
5
6The "-c" doesn't work in command "gzip file -c", need use "gzip -c file"
7
8Upstream-Status: Pending
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11---
12 Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/Makefile b/Makefile
16index 219a591..c7d147a 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -144,7 +144,7 @@ install_hwlatdetect: hwlatdetect
20 install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
21 rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
22 ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
23- gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
24+ gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
25 fi
26
27 .PHONY: release
28--
292.0.1
30
diff --git a/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch b/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch
deleted file mode 100644
index e38ec92c05..0000000000
--- a/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1Currently gzip on host is used. If host gzip is provided by pigz, it fails to
2redo install that pigz can't handle the option after file name. When run:
3
4gzip src/backfire/backfire.4 -c > OUTPUT_FILE
5
6File src/backfire/backfire.4 is zipped into backfire.4.gz but the OUTPUT_FILE
7is empty. When rerun do_install, it shows warning:
8
9| gzip: src/backfire/backfire.4 does not exist -- skipping
10
11and empty manual gzip files are created:
12
13$ file image/usr/share/man/man4/backfire.4.gz
14image/usr/share/man/man4/backfire.4.gz: empty
15
16Fix it by putting option '-c' before the file name.
17
18Upstream-Status: Pending
19
20Signed-off-by: Kai Kang <kai.kang@windriver.com>
21---
22--- git/Makefile.orig 2014-11-14 15:47:26.406638419 +0800
23+++ git/Makefile 2014-11-14 15:46:53.890637533 +0800
24@@ -127,15 +127,15 @@
25 cp $(TARGETS) "$(DESTDIR)$(bindir)"
26 install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
27 install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile"
28- gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
29- gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
30- gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
31- gzip src/ptsematest/ptsematest.8 -c >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
32- gzip src/sigwaittest/sigwaittest.8 -c >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
33- gzip src/svsematest/svsematest.8 -c >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
34- gzip src/pmqtest/pmqtest.8 -c >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
35- gzip src/backfire/sendme.8 -c >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
36- gzip src/hackbench/hackbench.8 -c >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
37+ gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
38+ gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
39+ gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
40+ gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
41+ gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
42+ gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
43+ gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
44+ gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
45+ gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
46
47 .PHONY: install_hwlatdetect
48 install_hwlatdetect: hwlatdetect
diff --git a/meta/recipes-rt/rt-tests/files/hackbench-fix-error-check.patch b/meta/recipes-rt/rt-tests/files/hackbench-fix-error-check.patch
deleted file mode 100644
index d17fdff455..0000000000
--- a/meta/recipes-rt/rt-tests/files/hackbench-fix-error-check.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1childinfo_t is a union that contains both signed (error) and unsigned
2(threadid) members. Thus a large threadid could appear as a negative error
3value, which will cause unexpected failures.
4
5childinfo_t should be changed to a struct, but it could potentially affect the
6performance. So we keep it as a union but only check error against -1. There is
7still a chance of false alarm but it's small.
8
9Upstream-Status: Pending
10
11Signed-off-by: Song.Li <Song.Li@windriver.com>
12Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
13---
14 src/hackbench/hackbench.c | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
18index 8baeb23..dc0de8f 100644
19--- a/src/hackbench/hackbench.c
20+++ b/src/hackbench/hackbench.c
21@@ -317,7 +317,7 @@ static unsigned int group(childinfo_t *child,
22 ctx->wakefd = wakefd;
23
24 child[tab_offset+i] = create_worker(ctx, (void *)(void *)receiver);
25- if( child[tab_offset+i].error < 0 ) {
26+ if( child[tab_offset+i].error == -1 ) {
27 return (i > 0 ? i-1 : 0);
28 }
29 snd_ctx->out_fds[i] = fds[1];
30@@ -332,7 +332,7 @@ static unsigned int group(childinfo_t *child,
31 snd_ctx->num_fds = num_fds;
32
33 child[tab_offset+num_fds+i] = create_worker(snd_ctx, (void *)(void *)sender);
34- if( child[tab_offset+num_fds+i].error < 0 ) {
35+ if( child[tab_offset+num_fds+i].error == -1 ) {
36 return (num_fds+i)-1;
37 }
38 }
39--
401.7.9.5
41
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.94.bb
index 8319eb987a..8319eb987a 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb
+++ b/meta/recipes-rt/rt-tests/hwlatdetect_0.94.bb
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 871db136c2..4e099dffa2 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,14 +1,8 @@
1# Version v0.92 1# Version v0.94
2PV = "0.92" 2PV = "0.94"
3SRCREV = "5f9f1e3fe327440a9d405f4af8feb16ff7a909eb" 3SRCREV = "a8fd81efa718ec449d90cba8f41123ed521bd12b"
4 4
5SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git \ 5SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git"
6 file://0001-rt-tests-Allow-for-user-specified-PYLIB.patch \
7 file://0002-rt-tests-Break-out-install_hwlatdetect.patch \
8 file://hackbench-fix-error-check.patch \
9 file://Makefile-fix-gzip-command.patch \
10 file://fix-re-install-failure.patch \
11"
12 6
13S = "${WORKDIR}/git" 7S = "${WORKDIR}/git"
14 8
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.92.bb b/meta/recipes-rt/rt-tests/rt-tests_0.94.bb
index fbe2f669e8..7d703925a8 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.92.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_0.94.bb
@@ -14,7 +14,9 @@ SRC_URI += "file://run-ptest \
14 file://rt_bmark.py \ 14 file://rt_bmark.py \
15 " 15 "
16# Do not install hwlatdetect 16# Do not install hwlatdetect
17EXTRA_OEMAKE += "PYLIB=''" 17EXTRA_OEMAKE += "PYLIB='' CROSS_COMPILE=${TARGET_PREFIX}"
18
19CFLAGS_prepend = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
18 20
19do_install() { 21do_install() {
20 oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \ 22 oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-10 21:40:30 +0000