summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-09-14 21:13:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-18 11:07:30 +0100
commit50b205ee274f2f29280a1da5401ce7ef61b6c0c7 (patch)
tree418d723efee5fd0ce334f6ea78b7004deb8139f0
parentc485df7dae7781ebf1f3b1525a6f6fc7fc99a18b (diff)
downloadpoky-50b205ee274f2f29280a1da5401ce7ef61b6c0c7.tar.gz
attr: Backports to fix exported headers
Packages which depends on attr headers fail due to uint32_t not being defined, this needed header to include sys/types.h (From OE-Core rev: af7c8f8a9bfc3396dc729f3fc54c38d19f2aa3fc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch69
-rw-r--r--meta/recipes-support/attr/attr_2.4.47.bb1
2 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch b/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
new file mode 100644
index 0000000000..dcd6507bcc
--- /dev/null
+++ b/meta/recipes-support/attr/attr/0001-Use-stdint-types-consistently.patch
@@ -0,0 +1,69 @@
1From 37a27b6fd09ecb37097b85e5db74e4f77b80fe0a Mon Sep 17 00:00:00 2001
2From: Felix Janda <felix.janda@posteo.de>
3Date: Tue, 12 Jan 2016 22:20:33 +0100
4Subject: [PATCH] Use stdint types consistently
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 include/attributes.h | 6 ++++--
11 man/man3/attr_list.3 | 8 ++++----
12 2 files changed, 8 insertions(+), 6 deletions(-)
13
14Index: attr-2.4.47/include/attributes.h
15===================================================================
16--- attr-2.4.47.orig/include/attributes.h
17+++ attr-2.4.47/include/attributes.h
18@@ -22,6 +22,7 @@
19 extern "C" {
20 #endif
21
22+#include <stdint.h>
23 /*
24 * An almost-IRIX-compatible extended attributes API
25 * (the IRIX attribute "list" operation is missing, added ATTR_SECURE).
26@@ -69,7 +70,7 @@ typedef struct attrlist {
27 * al_offset[i] entry points to.
28 */
29 typedef struct attrlist_ent { /* data from attr_list() */
30- u_int32_t a_valuelen; /* number bytes in value of attr */
31+ uint32_t a_valuelen; /* number bytes in value of attr */
32 char a_name[1]; /* attr name (NULL terminated) */
33 } attrlist_ent_t;
34
35@@ -90,7 +91,7 @@ typedef struct attrlist_ent { /* data fr
36 * operation on a cursor is to bzero() it.
37 */
38 typedef struct attrlist_cursor {
39- u_int32_t opaque[4]; /* an opaque cookie */
40+ uint32_t opaque[4]; /* an opaque cookie */
41 } attrlist_cursor_t;
42
43 /*
44Index: attr-2.4.47/man/man3/attr_list.3
45===================================================================
46--- attr-2.4.47.orig/man/man3/attr_list.3
47+++ attr-2.4.47/man/man3/attr_list.3
48@@ -72,9 +72,9 @@ The contents of an \f4attrlist_t\fP stru
49 .nf
50 .ft 4
51 .ta 9n 22n
52-__int32_t al_count; /\(** number of entries in attrlist \(**/
53-__int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
54-__int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
55+int32_t al_count; /\(** number of entries in attrlist \(**/
56+int32_t al_more; /\(** T/F: more attrs (do syscall again) \(**/
57+int32_t al_offset[1]; /\(** byte offsets of attrs [var-sized] \(**/
58 .ft 1
59 .fi
60 .RE
61@@ -113,7 +113,7 @@ include the following members:
62 .nf
63 .ft 4
64 .ta 9n 22n
65-u_int32_t a_valuelen; /\(** number bytes in value of attr \(**/
66+uint32_t a_valuelen; /\(** number bytes in value of attr \(**/
67 char a_name[]; /\(** attr name (NULL terminated) \(**/
68 .ft 1
69 .fi
diff --git a/meta/recipes-support/attr/attr_2.4.47.bb b/meta/recipes-support/attr/attr_2.4.47.bb
index 2dada7a1fc..fc88bef830 100644
--- a/meta/recipes-support/attr/attr_2.4.47.bb
+++ b/meta/recipes-support/attr/attr_2.4.47.bb
@@ -6,6 +6,7 @@ SRC_URI += "file://attr-Missing-configure.ac.patch \
6 file://dont-use-decl-macros.patch \ 6 file://dont-use-decl-macros.patch \
7 file://Remove-the-section-2-man-pages.patch \ 7 file://Remove-the-section-2-man-pages.patch \
8 file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \ 8 file://Remove-the-attr.5-man-page-moved-to-man-pages.patch \
9 file://0001-Use-stdint-types-consistently.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7" 12SRC_URI[md5sum] = "84f58dec00b60f2dc8fd1c9709291cc7"