diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-07-27 13:31:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-14 12:01:43 +0100 |
commit | 66d838ddc772b996d85e506250129bf5da5145e6 (patch) | |
tree | f74eabe96d88e6d5f985afbb6690fb980658a423 /meta/recipes-extended/stress-ng/stress-ng | |
parent | 3f9e8dfde19f62bfda2308437f18fca58d7363e9 (diff) | |
download | poky-66d838ddc772b996d85e506250129bf5da5145e6.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: 7c5d4136388ba59aafa38be4a454355040d3e6a5)
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>
(cherry picked from commit 96b1d483ccf2166bf577e73075d5fe57c45bbfdf)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/stress-ng/stress-ng')
-rw-r--r-- | meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch | 32 |
1 files changed, 0 insertions, 32 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 @@ | |||
1 | From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 9 Jun 2020 22:10:28 -0700 | ||
4 | Subject: [PATCH] Define daddr_t if __DADDR_T_TYPE is not defined | ||
5 | |||
6 | glibc defined daddr_t but musl does not, ideally it should not be used | ||
7 | and simple int type is enough. However, its better to leave glibc behavior | ||
8 | as it is and only define it to int if daddr_t is not provided by libc | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | |||
14 | --- | ||
15 | stress-ng.h | 4 ++++ | ||
16 | 1 file changed, 4 insertions(+) | ||
17 | |||
18 | diff --git a/stress-ng.h b/stress-ng.h | ||
19 | index 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) | ||