mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 06:32:12 +02:00
stress-ng: Drop defining daddr_t
This is fixed differently upstream [1]
[1] 7e150ab18b
(From OE-Core rev: 7c5d4136388ba59aafa38be4a454355040d3e6a5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 96b1d483ccf2166bf577e73075d5fe57c45bbfdf)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
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)
|
||||
@@ -7,7 +7,6 @@ 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] = "af7779aee38e6d94726ed7d5cf36384a64d50c86e42fff89c141d8609913f425"
|
||||
|
||||
@@ -24,4 +23,3 @@ do_install() {
|
||||
oe_runmake DESTDIR=${D} install
|
||||
ln -s stress-ng ${D}${bindir}/stress
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user