diff options
Diffstat (limited to 'poky/meta/recipes-extended/stress-ng')
| -rw-r--r-- | poky/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch | 32 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/stress-ng/stress-ng_0.11.21.bb (renamed from poky/meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb) | 6 |
2 files changed, 36 insertions, 2 deletions
diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch b/poky/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch new file mode 100644 index 000000000..dba4494b9 --- /dev/null +++ b/poky/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch @@ -0,0 +1,32 @@ +From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 +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 <raj.khem@gmail.com> + +--- + 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 +@@ -3763,6 +3763,10 @@ struct shim_statx { + uint64_t __spare2[14]; + }; + ++#ifndef __DADDR_T_TYPE ++typedef int daddr_t; ++#endif ++ + /* old ustat struct */ + struct shim_ustat { + #if defined(HAVE_DADDR_T) diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.21.bb index 3486be1b0..71671dd04 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.01.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.11.21.bb @@ -7,9 +7,9 @@ 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[md5sum] = "a558fc7fb9d0a851afe6de09080b5401" -SRC_URI[sha256sum] = "9fe19548c87aa1a1b9b2be3b359ec2621b88bcb16998b77527549a7736f65494" +SRC_URI[sha256sum] = "ee44b71aba20e9c7d10ec4768efa2245d12579fa17e08b9314c17f06f785ae39" DEPENDS = "coreutils-native" @@ -22,4 +22,6 @@ inherit bash-completion do_install() { oe_runmake DESTDIR=${D} install + ln -s stress-ng ${D}${bindir}/stress } + |