summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-06-26 09:18:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-28 08:36:00 +0100
commit8ed86f4c7ff0bf52067e500e7960dceb8bbd3da9 (patch)
tree3f22f33add8833655c0b63ab928c92bb1ffa70c2 /meta
parent4edc9bd4993e3d1eec1981f5dea62d56245da220 (diff)
downloadpoky-8ed86f4c7ff0bf52067e500e7960dceb8bbd3da9.tar.gz
stress-ng: upgrade 0.11.12 -> 0.11.14
(From OE-Core rev: fec547397e9573855971880e7672cf4cb8af6da4) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch16
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb (renamed from meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb)2
2 files changed, 14 insertions, 4 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
index 877f4f0624..dba4494b91 100644
--- a/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch
+++ b/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch
@@ -1,4 +1,7 @@
1Define daddr_t if __DADDR_T_TYPE is not defined 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
2 5
3glibc defined daddr_t but musl does not, ideally it should not be used 6glibc defined daddr_t but musl does not, ideally it should not be used
4and simple int type is enough. However, its better to leave glibc behavior 7and simple int type is enough. However, its better to leave glibc behavior
@@ -7,9 +10,16 @@ as it is and only define it to int if daddr_t is not provided by libc
7Upstream-Status: Pending 10Upstream-Status: Pending
8 11
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 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
10--- a/stress-ng.h 20--- a/stress-ng.h
11+++ b/stress-ng.h 21+++ b/stress-ng.h
12@@ -3750,6 +3750,10 @@ struct shim_statx { 22@@ -3763,6 +3763,10 @@ struct shim_statx {
13 uint64_t __spare2[14]; 23 uint64_t __spare2[14];
14 }; 24 };
15 25
@@ -19,4 +29,4 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19+ 29+
20 /* old ustat struct */ 30 /* old ustat struct */
21 struct shim_ustat { 31 struct shim_ustat {
22 daddr_t f_tfree; 32 #if defined(HAVE_DADDR_T)
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb
index c00086c095..f1d91da2b4 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb
@@ -9,7 +9,7 @@ SRC_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 \ 10 file://no_daddr_t.patch \
11 " 11 "
12SRC_URI[sha256sum] = "0ccf437ca1876a3e8a55986c6481697045203a17f5994cb2f5096cd461d18031" 12SRC_URI[sha256sum] = "b21436fdbd9dc482a3fd95ae27cccf0097d0f226361ea3785215f7a4ad50136b"
13 13
14DEPENDS = "coreutils-native" 14DEPENDS = "coreutils-native"
15 15