diff options
Diffstat (limited to 'meta/recipes-extended/stress-ng/stress-ng')
-rw-r--r-- | meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch | 23 | ||||
-rw-r--r-- | meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch | 32 |
2 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch deleted file mode 100644 index c860c717ac..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From bbc85a439672120fa1d36be79e959b28fe840919 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 30 Jul 2019 18:38:03 +0200 | ||
4 | Subject: [PATCH] Do not preserve ownership when installing example jobs | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | Makefile | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/Makefile b/Makefile | ||
13 | index f36e57e..20488af 100644 | ||
14 | --- a/Makefile | ||
15 | +++ b/Makefile | ||
16 | @@ -452,6 +452,6 @@ install: stress-ng stress-ng.1.gz | ||
17 | mkdir -p ${DESTDIR}${MANDIR} | ||
18 | cp stress-ng.1.gz ${DESTDIR}${MANDIR} | ||
19 | mkdir -p ${DESTDIR}${JOBDIR} | ||
20 | - cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR} | ||
21 | + cp -r example-jobs/*.job ${DESTDIR}${JOBDIR} | ||
22 | mkdir -p ${DESTDIR}${BASHDIR} | ||
23 | cp bash-completion/stress-ng ${DESTDIR}${BASHDIR} | ||
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) | ||