summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/stress-ng
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-07-27 13:31:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:47:00 +0100
commitc31188d721d02ee4a61280426ab6f328c2c7f059 (patch)
tree8bb4e6e34d04d983095616bb4ae068ee889f1618 /meta/recipes-extended/stress-ng
parentd299cb3be9da6513484e3e79be4b20874baf1d38 (diff)
downloadpoky-c31188d721d02ee4a61280426ab6f328c2c7f059.tar.gz
stress-ng: Drop defining daddr_t
This is fixed differently upstream [1] [1] https://github.com/ColinIanKing/stress-ng/commit/7e150ab18b0e8954ca426eb5366000a8f0d01110 (From OE-Core rev: 96b1d483ccf2166bf577e73075d5fe57c45bbfdf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/stress-ng')
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch32
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb2
2 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch b/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch
deleted file mode 100644
index dba4494b91..0000000000
--- a/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 9 Jun 2020 22:10:28 -0700
4Subject: [PATCH] Define daddr_t if __DADDR_T_TYPE is not defined
5
6glibc defined daddr_t but musl does not, ideally it should not be used
7and simple int type is enough. However, its better to leave glibc behavior
8as it is and only define it to int if daddr_t is not provided by libc
9
10Upstream-Status: Pending
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14---
15 stress-ng.h | 4 ++++
16 1 file changed, 4 insertions(+)
17
18diff --git a/stress-ng.h b/stress-ng.h
19index 1a66293..802dc25 100644
20--- a/stress-ng.h
21+++ b/stress-ng.h
22@@ -3763,6 +3763,10 @@ struct shim_statx {
23 uint64_t __spare2[14];
24 };
25
26+#ifndef __DADDR_T_TYPE
27+typedef int daddr_t;
28+#endif
29+
30 /* old ustat struct */
31 struct shim_ustat {
32 #if defined(HAVE_DADDR_T)
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb b/meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb
index 97eaa75d18..430eac0d87 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ 8SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
9 file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ 9 file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
10 file://no_daddr_t.patch \
11 " 10 "
12SRC_URI[sha256sum] = "f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499" 11SRC_URI[sha256sum] = "f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499"
13 12
@@ -24,4 +23,3 @@ do_install() {
24 oe_runmake DESTDIR=${D} install 23 oe_runmake DESTDIR=${D} install
25 ln -s stress-ng ${D}${bindir}/stress 24 ln -s stress-ng ${D}${bindir}/stress
26} 25}
27