diff options
author | Randy MacLeod <randy.macleod@windriver.com> | 2018-11-12 16:14:59 -0500 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-12 17:28:49 -0800 |
commit | d5bcdfc064a5c2f91728c976dc3e7a5dbd5c22c5 (patch) | |
tree | 7ca9a25159ba55af2ee01e8cb7a6a156c655cd40 /meta-oe/recipes-test | |
parent | 727d77af161d8aa9bc8ef505f4f227d1250024da (diff) | |
download | meta-openembedded-d5bcdfc064a5c2f91728c976dc3e7a5dbd5c22c5.tar.gz |
stress-ng: Upgrade from 0.09.37 to 0.09.45
Drop the upstreamed patch:
0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch
Rebase other patches except for the stress-malloc.c change
which has made it upstream:
c3a2e662 stress-malloc: use HAVE_MALLOPT check for mallopt glibc function
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-test')
-rw-r--r-- | meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch | 21 | ||||
-rw-r--r-- | meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch | 47 | ||||
-rw-r--r-- | meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb (renamed from meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb) | 6 |
4 files changed, 34 insertions, 70 deletions
diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch index fd2199e53..469791d8e 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch +++ b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch | |||
@@ -14,15 +14,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | Makefile | 1 - | 14 | Makefile | 1 - |
15 | 1 file changed, 1 deletion(-) | 15 | 1 file changed, 1 deletion(-) |
16 | 16 | ||
17 | Index: stress-ng-0.09.37/Makefile | 17 | diff --git a/Makefile b/Makefile |
18 | =================================================================== | 18 | index c0db72c0..5781dda6 100644 |
19 | --- stress-ng-0.09.37.orig/Makefile | 19 | --- a/Makefile |
20 | +++ stress-ng-0.09.37/Makefile | 20 | +++ b/Makefile |
21 | @@ -344,7 +344,6 @@ OBJS += $(CONFIG_OBJS) | 21 | @@ -348,7 +348,6 @@ endif |
22 | stress-ng: info $(OBJS) | 22 | stress-ng: $(OBJS) |
23 | @echo "LD $@" | 23 | @echo "LD $@" |
24 | @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@ | 24 | @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@ |
25 | - @sync | 25 | - @sync |
26 | 26 | ||
27 | .PHONY: info | 27 | makeconfig: |
28 | info: | 28 | @if [ ! -s config ]; then \ |
29 | -- | ||
30 | 2.17.0 | ||
31 | |||
diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch index 93d9b544d..c0b344901 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch +++ b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch | |||
@@ -1,11 +1,13 @@ | |||
1 | From d499375fe267be8819ecb985123d89a21edc0e59 Mon Sep 17 00:00:00 2001 | 1 | From 9bcb4e170f01dbe0a9e7bf6b899c5d9b5283d4c6 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org> | 2 | From: Randy MacLeod <Randy.MacLeod@windriver.com> |
3 | Date: Tue, 17 Oct 2017 10:13:20 -0500 | 3 | Date: Sun, 11 Nov 2018 23:00:53 -0500 |
4 | Subject: [PATCH] Several changes to fix musl build | 4 | Subject: [PATCH] Several changes to fix musl build |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
8 | 8 | ||
9 | Rebased patch for: | ||
10 | |||
9 | stress-{context, stackmmap}.c: Set tests to non-implemented because uses | 11 | stress-{context, stackmmap}.c: Set tests to non-implemented because uses |
10 | swapcontext, musl provide the definition but not the implementation due | 12 | swapcontext, musl provide the definition but not the implementation due |
11 | to that functions are pre-POSIX and set to be deprecated. | 13 | to that functions are pre-POSIX and set to be deprecated. |
@@ -19,20 +21,19 @@ cache.c: Define GLOB_ONLYDIR not available on MUSL. | |||
19 | 21 | ||
20 | Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> | 22 | Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> |
21 | Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> | 23 | Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com> |
24 | Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> | ||
22 | 25 | ||
23 | Upstream-status: Pending | 26 | Upstream-status: Pending |
24 | |||
25 | --- | 27 | --- |
26 | cache.c | 4 ++++ | 28 | cache.c | 4 ++++ |
27 | stress-madvise.c | 1 + | 29 | stress-madvise.c | 1 + |
28 | stress-malloc.c | 2 +- | ||
29 | stress-pty.c | 18 ------------------ | 30 | stress-pty.c | 18 ------------------ |
30 | stress-resources.c | 1 - | 31 | stress-resources.c | 1 - |
31 | stress-stackmmap.c | 2 +- | 32 | stress-stackmmap.c | 2 +- |
32 | 6 files changed, 7 insertions(+), 21 deletions(-) | 33 | 5 files changed, 6 insertions(+), 20 deletions(-) |
33 | 34 | ||
34 | diff --git a/cache.c b/cache.c | 35 | diff --git a/cache.c b/cache.c |
35 | index fbf7674..936c1ff 100644 | 36 | index e8a0f791..4c7bb486 100644 |
36 | --- a/cache.c | 37 | --- a/cache.c |
37 | +++ b/cache.c | 38 | +++ b/cache.c |
38 | @@ -28,6 +28,10 @@ typedef struct { | 39 | @@ -28,6 +28,10 @@ typedef struct { |
@@ -47,10 +48,10 @@ index fbf7674..936c1ff 100644 | |||
47 | #define SYS_CPU_PREFIX "/sys/devices/system/cpu" | 48 | #define SYS_CPU_PREFIX "/sys/devices/system/cpu" |
48 | #define GLOB_PATTERN SYS_CPU_PREFIX "/cpu[0-9]*" | 49 | #define GLOB_PATTERN SYS_CPU_PREFIX "/cpu[0-9]*" |
49 | diff --git a/stress-madvise.c b/stress-madvise.c | 50 | diff --git a/stress-madvise.c b/stress-madvise.c |
50 | index 9e71e11..ddf8d2d 100644 | 51 | index b2e3497f..77e43a91 100644 |
51 | --- a/stress-madvise.c | 52 | --- a/stress-madvise.c |
52 | +++ b/stress-madvise.c | 53 | +++ b/stress-madvise.c |
53 | @@ -147,6 +147,7 @@ static int stress_random_advise(const args_t *args) | 54 | @@ -146,6 +146,7 @@ static int stress_random_advise(const args_t *args) |
54 | #if defined(MADV_SOFT_OFFLINE) | 55 | #if defined(MADV_SOFT_OFFLINE) |
55 | if (advise == MADV_SOFT_OFFLINE) { | 56 | if (advise == MADV_SOFT_OFFLINE) { |
56 | static int soft_offline_count; | 57 | static int soft_offline_count; |
@@ -58,21 +59,8 @@ index 9e71e11..ddf8d2d 100644 | |||
58 | 59 | ||
59 | /* ..and minimize number of soft offline pages */ | 60 | /* ..and minimize number of soft offline pages */ |
60 | if ((soft_offline_count >= NUM_SOFT_OFFLINE_MAX) || | 61 | if ((soft_offline_count >= NUM_SOFT_OFFLINE_MAX) || |
61 | diff --git a/stress-malloc.c b/stress-malloc.c | ||
62 | index a46b8c6..427827a 100644 | ||
63 | --- a/stress-malloc.c | ||
64 | +++ b/stress-malloc.c | ||
65 | @@ -99,7 +99,7 @@ int stress_malloc(const args_t *args) | ||
66 | malloc_max = MIN_MALLOC_MAX; | ||
67 | } | ||
68 | |||
69 | -#if defined(__GNUC__) && defined(__linux__) | ||
70 | +#if defined(__GNUC__) && defined(__linux__) && defined(M_MMAP_THRESHOLD) | ||
71 | if (get_setting("malloc-threshold", &malloc_threshold)) | ||
72 | (void)mallopt(M_MMAP_THRESHOLD, (int)malloc_threshold); | ||
73 | #endif | ||
74 | diff --git a/stress-pty.c b/stress-pty.c | 62 | diff --git a/stress-pty.c b/stress-pty.c |
75 | index 1bd1fbd..b1fe573 100644 | 63 | index 4dd88ab9..c79a7021 100644 |
76 | --- a/stress-pty.c | 64 | --- a/stress-pty.c |
77 | +++ b/stress-pty.c | 65 | +++ b/stress-pty.c |
78 | @@ -26,7 +26,6 @@ | 66 | @@ -26,7 +26,6 @@ |
@@ -83,7 +71,7 @@ index 1bd1fbd..b1fe573 100644 | |||
83 | #include <termios.h> | 71 | #include <termios.h> |
84 | 72 | ||
85 | typedef struct { | 73 | typedef struct { |
86 | @@ -108,7 +107,6 @@ int stress_pty(const args_t *args) | 74 | @@ -111,7 +110,6 @@ static int stress_pty(const args_t *args) |
87 | */ | 75 | */ |
88 | for (i = 0; i < n; i++) { | 76 | for (i = 0; i < n; i++) { |
89 | struct termios ios; | 77 | struct termios ios; |
@@ -91,7 +79,7 @@ index 1bd1fbd..b1fe573 100644 | |||
91 | struct winsize ws; | 79 | struct winsize ws; |
92 | int arg; | 80 | int arg; |
93 | 81 | ||
94 | @@ -130,22 +128,6 @@ int stress_pty(const args_t *args) | 82 | @@ -133,22 +131,6 @@ static int stress_pty(const args_t *args) |
95 | if (ioctl(ptys[i].slave, TCSETSF, &ios) < 0) | 83 | if (ioctl(ptys[i].slave, TCSETSF, &ios) < 0) |
96 | pr_fail_err("ioctl TCSETSF on slave pty"); | 84 | pr_fail_err("ioctl TCSETSF on slave pty"); |
97 | #endif | 85 | #endif |
@@ -115,10 +103,10 @@ index 1bd1fbd..b1fe573 100644 | |||
115 | if (ioctl(ptys[i].slave, TIOCGLCKTRMIOS, &ios) < 0) | 103 | if (ioctl(ptys[i].slave, TIOCGLCKTRMIOS, &ios) < 0) |
116 | pr_fail_err("ioctl TIOCGLCKTRMIOS on slave pty"); | 104 | pr_fail_err("ioctl TIOCGLCKTRMIOS on slave pty"); |
117 | diff --git a/stress-resources.c b/stress-resources.c | 105 | diff --git a/stress-resources.c b/stress-resources.c |
118 | index 958c99a..af79abd 100644 | 106 | index f3dcfb38..86f9a5ba 100644 |
119 | --- a/stress-resources.c | 107 | --- a/stress-resources.c |
120 | +++ b/stress-resources.c | 108 | +++ b/stress-resources.c |
121 | @@ -31,7 +31,6 @@ | 109 | @@ -28,7 +28,6 @@ |
122 | #include <sys/inotify.h> | 110 | #include <sys/inotify.h> |
123 | #endif | 111 | #endif |
124 | #if defined(__linux__) | 112 | #if defined(__linux__) |
@@ -127,7 +115,7 @@ index 958c99a..af79abd 100644 | |||
127 | #endif | 115 | #endif |
128 | #if defined(HAVE_LIB_PTHREAD) && defined(__linux__) | 116 | #if defined(HAVE_LIB_PTHREAD) && defined(__linux__) |
129 | diff --git a/stress-stackmmap.c b/stress-stackmmap.c | 117 | diff --git a/stress-stackmmap.c b/stress-stackmmap.c |
130 | index 9c83a69..2984f09 100644 | 118 | index c2f4c31d..54308777 100644 |
131 | --- a/stress-stackmmap.c | 119 | --- a/stress-stackmmap.c |
132 | +++ b/stress-stackmmap.c | 120 | +++ b/stress-stackmmap.c |
133 | @@ -24,7 +24,7 @@ | 121 | @@ -24,7 +24,7 @@ |
@@ -139,3 +127,6 @@ index 9c83a69..2984f09 100644 | |||
139 | 127 | ||
140 | #include <ucontext.h> | 128 | #include <ucontext.h> |
141 | 129 | ||
130 | -- | ||
131 | 2.17.0 | ||
132 | |||
diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch deleted file mode 100644 index cd9131df5..000000000 --- a/meta-oe/recipes-test/stress-ng/stress-ng/0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 59f5ff72768f228cd530bb18a5fc3e8c4772857a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 20 Aug 2018 21:43:14 -0700 | ||
4 | Subject: [PATCH] stress-ng: don't enable TARGET_CLONES for musl | ||
5 | |||
6 | musl does not support gnu ifuncs | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/27] | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | stress-ng.h | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/stress-ng.h b/stress-ng.h | ||
16 | index b9359a4..f228808 100644 | ||
17 | --- a/stress-ng.h | ||
18 | +++ b/stress-ng.h | ||
19 | @@ -1090,7 +1090,7 @@ extern void pr_fail_dbg__(const args_t *args, const char *msg); | ||
20 | #endif | ||
21 | |||
22 | /* GCC5.0+ target_clones attribute */ | ||
23 | -#if defined(__GNUC__) && NEED_GNUC(5,5,0) && STRESS_X86 && \ | ||
24 | +#if defined(__GNUC__) && defined(__GLIBC__) && NEED_GNUC(5,5,0) && STRESS_X86 && \ | ||
25 | !defined(__gnu_hurd__) && !defined(__FreeBSD_Kernel__) | ||
26 | #define TARGET_CLONES __attribute__((target_clones("sse","sse2","ssse3", "sse4.1", "sse4a", "avx","avx2","default"))) | ||
27 | #else | ||
28 | -- | ||
29 | 2.18.0 | ||
30 | |||
diff --git a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb index a6c327e38..3e8f2d4f5 100644 --- a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.37.bb +++ b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.45.bb | |||
@@ -7,13 +7,13 @@ DEPENDS = "zlib libaio" | |||
7 | 7 | ||
8 | SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ | 8 | SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ |
9 | file://0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch \ | 9 | file://0001-Revert-Makefile-force-sync-after-build-in-case-reboo.patch \ |
10 | file://0001-stress-ng-don-t-enable-TARGET_CLONES-for-musl.patch \ | ||
11 | " | 10 | " |
12 | SRC_URI_append_libc-musl = " \ | 11 | SRC_URI_append_libc-musl = " \ |
13 | file://0001-Several-changes-to-fix-musl-build.patch \ | 12 | file://0001-Several-changes-to-fix-musl-build.patch \ |
14 | " | 13 | " |
15 | SRC_URI[md5sum] = "81d73313ea7778f749470b6f950553af" | 14 | |
16 | SRC_URI[sha256sum] = "8494afb2f2e2cf7e79ec9c6c3129308b098e530141ba2b07d6547708fd63af3d" | 15 | SRC_URI[md5sum] = "b03744c2eb68bf7e9a300e78e397f348" |
16 | SRC_URI[sha256sum] = "0741e3004bf590bb7af3db979a46fe89bee7aaad6065cd1d87d0b7fa49046cb2" | ||
17 | 17 | ||
18 | UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/" | 18 | UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/" |
19 | UPSTREAM_CHECK_REGEX ?= "(?P<pver>\d+(\.\d+)+)\.tar" | 19 | UPSTREAM_CHECK_REGEX ?= "(?P<pver>\d+(\.\d+)+)\.tar" |