From 8ed86f4c7ff0bf52067e500e7960dceb8bbd3da9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 26 Jun 2020 09:18:27 +0200 Subject: stress-ng: upgrade 0.11.12 -> 0.11.14 (From OE-Core rev: fec547397e9573855971880e7672cf4cb8af6da4) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../stress-ng/stress-ng/no_daddr_t.patch | 16 ++++++++++--- .../stress-ng/stress-ng_0.11.12.bb | 26 ---------------------- .../stress-ng/stress-ng_0.11.14.bb | 26 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb create mode 100644 meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb (limited to 'meta/recipes-extended/stress-ng') 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 @@ -Define daddr_t if __DADDR_T_TYPE is not defined +From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 9 Jun 2020 22:10:28 -0700 +Subject: [PATCH] Define daddr_t if __DADDR_T_TYPE is not defined glibc defined daddr_t but musl does not, ideally it should not be used and 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 Upstream-Status: Pending Signed-off-by: Khem Raj + +--- + stress-ng.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/stress-ng.h b/stress-ng.h +index 1a66293..802dc25 100644 --- a/stress-ng.h +++ b/stress-ng.h -@@ -3750,6 +3750,10 @@ struct shim_statx { +@@ -3763,6 +3763,10 @@ struct shim_statx { uint64_t __spare2[14]; }; @@ -19,4 +29,4 @@ Signed-off-by: Khem Raj + /* old ustat struct */ struct shim_ustat { - daddr_t f_tfree; + #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.12.bb deleted file mode 100644 index c00086c095..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng_0.11.12.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "System load testing utility" -DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ -imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." -HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ - file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ - file://no_daddr_t.patch \ - " -SRC_URI[sha256sum] = "0ccf437ca1876a3e8a55986c6481697045203a17f5994cb2f5096cd461d18031" - -DEPENDS = "coreutils-native" - -PROVIDES = "stress" -RPROVIDES_${PN} = "stress" -RREPLACES_${PN} = "stress" -RCONFLICTS_${PN} = "stress" - -inherit bash-completion - -do_install() { - oe_runmake DESTDIR=${D} install -} - diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb b/meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb new file mode 100644 index 0000000000..f1d91da2b4 --- /dev/null +++ b/meta/recipes-extended/stress-ng/stress-ng_0.11.14.bb @@ -0,0 +1,26 @@ +SUMMARY = "System load testing utility" +DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ +imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." +HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ + file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ + file://no_daddr_t.patch \ + " +SRC_URI[sha256sum] = "b21436fdbd9dc482a3fd95ae27cccf0097d0f226361ea3785215f7a4ad50136b" + +DEPENDS = "coreutils-native" + +PROVIDES = "stress" +RPROVIDES_${PN} = "stress" +RREPLACES_${PN} = "stress" +RCONFLICTS_${PN} = "stress" + +inherit bash-completion + +do_install() { + oe_runmake DESTDIR=${D} install +} + -- cgit v1.2.3-54-g00ecf