aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhengruoqin <zhengrq.fnst@fujitsu.com>2021-06-11 02:52:26 +0800
committerKhem Raj <raj.khem@gmail.com>2021-06-10 07:06:34 -0700
commite343088c7e7a28713b51135db91022e9784d555a (patch)
tree736db6a0d373f8676938976d809e1be15c3b94b3
parent7aa12cd781cf1b22fc7d7d6390a6753c625e124c (diff)
downloadmeta-openembedded-e343088c7e7a28713b51135db91022e9784d555a.tar.gz
meta-openembedded-e343088c7e7a28713b51135db91022e9784d555a.tar.bz2
meta-openembedded-e343088c7e7a28713b51135db91022e9784d555a.zip
iozone3: upgrade 490 -> 492
Refresh the following patch: parallelism.patch Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch35
-rw-r--r--meta-oe/recipes-benchmark/iozone3/iozone3_492.bb (renamed from meta-oe/recipes-benchmark/iozone3/iozone3_490.bb)4
2 files changed, 23 insertions, 16 deletions
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch b/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch
index d5622ed2c..48069ff14 100644
--- a/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch
+++ b/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch
@@ -10,20 +10,24 @@ Only fixed linux targets for now
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
+---
+ current/makefile | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
-
---- current/makefile.org 2016-12-06 02:19:10.367911020 +0000
-+++ current/makefile 2016-12-06 02:21:38.767911020 +0000
-@@ -167,7 +167,7 @@
+diff --git current/makefile current/makefile
+index 3a54701..7071427 100644
+--- current/makefile
++++ current/makefile
+@@ -171,7 +171,7 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
-linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o
+linux: iozone_linux.o fileop_linux.o pit_server.o
- $(CC) -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \
+ $(CC) -O3 $(CFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \
-lrt -o iozone
- $(CC) -O3 -Dlinux fileop_linux.o -o fileop
-@@ -176,7 +176,7 @@
+ $(CC) -O3 $(CFLAGS) -Dlinux fileop_linux.o -o fileop
+@@ -180,7 +180,7 @@ linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o
#
# GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O
#
@@ -32,7 +36,7 @@ Upstream-Status: Pending
$(CC) -O3 $(LDFLAGS) iozone_linux-powerpc.o libasync.o \
libbif.o -lpthread -lrt -o iozone
$(CC) -O3 -Dlinux fileop_linux-ppc.o -o fileop
-@@ -184,7 +184,7 @@
+@@ -188,7 +188,7 @@ linux-powerpc: iozone_linux-powerpc.o libbif.o libasync.o fileop_linux-ppc.o pi
#
# GNU 'C' compiler Linux build for sparc chip with threads, largefiles, async I/O
#
@@ -41,7 +45,7 @@ Upstream-Status: Pending
$(CC) -O3 $(LDFLAGS) iozone_linux-sparc.o libasync.o libbif.o \
-lpthread -lrt -o iozone
$(CC) -O3 -Dlinux fileop_linux.o -o fileop
-@@ -193,7 +193,7 @@
+@@ -197,7 +197,7 @@ linux-sparc: iozone_linux-sparc.o libbif.o libasync.o fileop_linux.o pit_server
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
@@ -50,7 +54,7 @@ Upstream-Status: Pending
$(CC) -O3 $(LDFLAGS) iozone_linux-ia64.o libbif.o libasync.o \
-lrt -lpthread -o iozone
$(CC) -O3 -Dlinux fileop_linux-ia64.o -o fileop
-@@ -202,7 +202,7 @@
+@@ -206,7 +206,7 @@ linux-ia64: iozone_linux-ia64.o libbif.o libasync.o fileop_linux-ia64.o pit_ser
#
# GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O
#
@@ -59,7 +63,7 @@ Upstream-Status: Pending
$(CC) -O3 -Dunix -DHAVE_ANSIC_C -DSHARED_MEM -DASYNC_IO \
-D_LARGEFILE64_SOURCE -Dlinux \
iozone_linux-powerpc64.o libasync.o libbif.o -lpthread \
-@@ -213,7 +213,7 @@
+@@ -217,7 +217,7 @@ linux-powerpc64: iozone_linux-powerpc64.o libbif.o libasync.o fileop_linux-ppc6
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
@@ -68,7 +72,7 @@ Upstream-Status: Pending
$(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \
-lrt -lpthread -o iozone
$(CC) -O3 -Dlinux fileop_linux-arm.o -o fileop
-@@ -222,7 +222,7 @@
+@@ -249,7 +249,7 @@ endif
#
# GNU 'C' compiler Linux build with threads, largefiles, async I/O
#
@@ -77,7 +81,7 @@ Upstream-Status: Pending
$(CC) -O3 $(LDFLAGS) iozone_linux-AMD64.o libbif.o libasync.o \
-lrt -lpthread -o iozone
$(CC) -O3 -Dlinux fileop_linux-AMD64.o -o fileop
-@@ -231,7 +231,7 @@
+@@ -258,7 +258,7 @@ linux-AMD64: iozone_linux-AMD64.o libbif.o libasync.o fileop_linux-AMD64.o pit_
#
# GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O
#
@@ -86,7 +90,7 @@ Upstream-Status: Pending
$(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390.o \
libbif.o libasync.o -o iozone
$(CC) -O3 -Dlinux fileop_linux-s390.o -o fileop
-@@ -240,7 +240,7 @@
+@@ -267,7 +267,7 @@ linux-S390: iozone_linux-s390.o libbif.o libasync.o fileop_linux-s390.o pit_serv
#
# GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O
#
@@ -95,3 +99,6 @@ Upstream-Status: Pending
$(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390x.o \
libbif.o libasync.o -o iozone
$(CC) -O3 -Dlinux fileop_linux-s390x.o -o fileop
+--
+2.25.1
+
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_492.bb
index 1d2e53a31..a68a27c97 100644
--- a/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb
+++ b/meta-oe/recipes-benchmark/iozone3/iozone3_492.bb
@@ -11,8 +11,8 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \
file://0001-let-system-headers-provide-pread64.patch \
file://copyright.txt \
"
-SRC_URI[md5sum] = "95cb73dfdd58a0dfa42804f016dbb83c"
-SRC_URI[sha256sum] = "5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed"
+SRC_URI[md5sum] = "228f54482c01d1c04c571a9414cd20e5"
+SRC_URI[sha256sum] = "322981e168f32bd39f54772b82b2906d598d958c37e954e75742e71baf58bb9b"
UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar"