summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch28
-rw-r--r--meta/recipes-rt/rt-tests/hwlatdetect_1.8.bb (renamed from meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb)0
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch62
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests.inc11
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests_1.8.bb (renamed from meta/recipes-rt/rt-tests/rt-tests_1.1.bb)9
5 files changed, 35 insertions, 75 deletions
diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
new file mode 100644
index 0000000000..c18928ed02
--- /dev/null
+++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
@@ -0,0 +1,28 @@
1From caaa142826504ad0375f9d21c558f10f31305cdb Mon Sep 17 00:00:00 2001
2From: Randy Witt <randy.e.witt@intel.com>
3Date: Fri, 16 Oct 2020 16:54:30 -0700
4Subject: [PATCH] Makefile: Allow for CC and AR to be overridden
5
6The Makefile previously allowed for this but it was removed upstream in
7commit 7763cf316d7896fa05b816a46998f0827ab6e6eb.
8
9Signed-off-by: Randy Witt <randy.e.witt@intel.com>
10
11Upstream-Status: Inappropriate [other]
12---
13 Makefile | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/Makefile b/Makefile
17index 05fc5ed..7a289c8 100644
18--- a/Makefile
19+++ b/Makefile
20@@ -1,6 +1,6 @@
21 VERSION = 1.8
22-CC = $(CROSS_COMPILE)gcc
23-AR = $(CROSS_COMPILE)ar
24+CC ?= $(CROSS_COMPILE)gcc
25+AR ?= $(CROSS_COMPILE)ar
26
27 OBJDIR = bld
28
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb b/meta/recipes-rt/rt-tests/hwlatdetect_1.8.bb
index 5f61c4ecdd..5f61c4ecdd 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb
+++ b/meta/recipes-rt/rt-tests/hwlatdetect_1.8.bb
diff --git a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch
deleted file mode 100644
index 3bafbbe08f..0000000000
--- a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Tue, 25 Feb 2020 22:58:59 +0000
4Subject: [PATCH] gzip with -n for build reproducibilty
5
6The date can get encoded in the header of the gz file, which
7causes the binary files between two different builds of the
8same data to be different. Add -n for reproducibilty
9
10Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
11
12Upstream-Status: Submitted [mailinglist]
13
14---
15 Makefile | 24 ++++++++++++------------
16 1 file changed, 12 insertions(+), 12 deletions(-)
17
18diff --git a/Makefile b/Makefile
19index a54d82b..e9f0d5a 100644
20--- a/Makefile
21+++ b/Makefile
22@@ -168,17 +168,17 @@ install: all install_hwlatdetect
23 cp $(TARGETS) "$(DESTDIR)$(bindir)"
24 install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
25 install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile"
26- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
27- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
28- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
29- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
30- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz"
31- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
32- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
33- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
34- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
35- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
36- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz"
37+ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
38+ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
39+ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
40+ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
41+ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz"
42+ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
43+ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
44+ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
45+ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
46+ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
47+ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz"
48
49 .PHONY: install_hwlatdetect
50 install_hwlatdetect: hwlatdetect
51@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect
52 install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \
53 rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \
54 ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \
55- gzip -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
56+ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \
57 fi
58
59 .PHONY: tarball
60--
612.23.0
62
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 6e3afafce4..5d28c7e63e 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,12 +1,7 @@
1# Version 1.1 1# Version 1.8
2SRCREV = "dff174f994f547a5785d32454865f140daacb0f5" 2SRCREV = "9f78b91f057e63b0c241012ce36b57168133eefb"
3PE = "1" 3PE = "1"
4 4
5SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git" 5SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=unstable/devel/latest"
6# 1.2 and up seem to be development versions
7UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.[2-8])(\d+(\.\d+)+))"
8 6
9S = "${WORKDIR}/git" 7S = "${WORKDIR}/git"
10
11# calling 'uname -m' is broken on crossbuilds
12EXTRA_OEMAKE = "NUMA=0"
diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.8.bb
index dad252b4ed..2834cabcd4 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_1.8.bb
@@ -1,11 +1,9 @@
1SUMMARY = "Real-Time preemption testcases" 1SUMMARY = "Real-Time preemption testcases"
2HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" 2HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest"
3SECTION = "tests" 3SECTION = "tests"
4DEPENDS = "linux-libc-headers virtual/libc" 4DEPENDS = "linux-libc-headers virtual/libc numactl"
5LICENSE = "GPLv2 & GPLv2+" 5LICENSE = "GPLv2 & GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
7 file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=e768b8da44555fe63f65e5c497844cb5 \
8 file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949"
9 7
10require rt-tests.inc 8require rt-tests.inc
11inherit ptest 9inherit ptest
@@ -13,7 +11,7 @@ inherit ptest
13SRC_URI += " \ 11SRC_URI += " \
14 file://run-ptest \ 12 file://run-ptest \
15 file://rt_bmark.py \ 13 file://rt_bmark.py \
16 file://0001-gzip-with-n-for-build-reproducibilty.patch \ 14 file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \
17 " 15 "
18 16
19# rt-tests needs PI mutex support in libc 17# rt-tests needs PI mutex support in libc
@@ -34,3 +32,4 @@ do_install_ptest() {
34RDEPENDS_${PN}-ptest += " stress-ng python3 python3-multiprocessing python3-datetime python3-misc" 32RDEPENDS_${PN}-ptest += " stress-ng python3 python3-multiprocessing python3-datetime python3-misc"
35 33
36FILES_${PN} += "${prefix}/src/backfire" 34FILES_${PN} += "${prefix}/src/backfire"
35RDEPENDS_${PN} += "bash"