summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-02-21 19:55:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:07 +0000
commit584761577bc819ec45c2c8d86ff8d29748f9a051 (patch)
treeeb57f69447c10977066a38f754afe563da93e8e3 /meta/recipes-devtools
parent3b2d79971f81251a3d4ee467b7144ffd8d937fcc (diff)
downloadpoky-584761577bc819ec45c2c8d86ff8d29748f9a051.tar.gz
e2fsprogs: Fix build with glibc-2.25
(From OE-Core rev: 1e8fc70596e27edca428dd78b8095e6b76aa8e58) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-1.43-sysmacros.patch130
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb1
2 files changed, 131 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-1.43-sysmacros.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-1.43-sysmacros.patch
new file mode 100644
index 0000000000..abbf2bad26
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/e2fsprogs-1.43-sysmacros.patch
@@ -0,0 +1,130 @@
1From 30ef41f68703b6a16027cc8787118b87f1462dff Mon Sep 17 00:00:00 2001
2From: Mike Frysinger <vapier@gentoo.org>
3Date: Mon, 28 Mar 2016 20:31:33 -0400
4Subject: [PATCH e2fsprogs] include sys/sysmacros.h as needed
5
6The minor/major/makedev macros are not entirely standard. glibc has had
7the definitions in sys/sysmacros.h since the start, and wants to move away
8from always defining them implicitly via sys/types.h (as this pollutes the
9namespace in violation of POSIX). Other C libraries have already dropped
10them. Since the configure script already checks for this header, use that
11to pull in the header in files that use these macros.
12
13Signed-off-by: Mike Frysinger <vapier@gentoo.org>
14
15Taken from gentoo portage.
16
17Upstream-Status: Pending
18
19---
20 debugfs/debugfs.c | 3 +++
21 lib/blkid/devname.c | 3 +++
22 lib/blkid/devno.c | 3 +++
23 lib/ext2fs/finddev.c | 3 +++
24 lib/ext2fs/ismounted.c | 3 +++
25 misc/create_inode.c | 4 ++++
26 misc/mk_hugefiles.c | 3 +++
27 7 files changed, 22 insertions(+)
28
29diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
30index ba8be40..7d481bc 100644
31--- a/debugfs/debugfs.c
32+++ b/debugfs/debugfs.c
33@@ -26,6 +26,9 @@ extern char *optarg;
34 #include <errno.h>
35 #endif
36 #include <fcntl.h>
37+#ifdef HAVE_SYS_SYSMACROS_H
38+#include <sys/sysmacros.h>
39+#endif
40
41 #include "debugfs.h"
42 #include "uuid/uuid.h"
43diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
44index 3e2efa9..671e781 100644
45--- a/lib/blkid/devname.c
46+++ b/lib/blkid/devname.c
47@@ -36,6 +36,9 @@
48 #if HAVE_SYS_MKDEV_H
49 #include <sys/mkdev.h>
50 #endif
51+#ifdef HAVE_SYS_SYSMACROS_H
52+#include <sys/sysmacros.h>
53+#endif
54 #include <time.h>
55
56 #include "blkidP.h"
57diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
58index 479d977..61e6fc7 100644
59--- a/lib/blkid/devno.c
60+++ b/lib/blkid/devno.c
61@@ -31,6 +31,9 @@
62 #if HAVE_SYS_MKDEV_H
63 #include <sys/mkdev.h>
64 #endif
65+#ifdef HAVE_SYS_SYSMACROS_H
66+#include <sys/sysmacros.h>
67+#endif
68
69 #include "blkidP.h"
70
71diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c
72index 311608d..62fa0db 100644
73--- a/lib/ext2fs/finddev.c
74+++ b/lib/ext2fs/finddev.c
75@@ -31,6 +31,9 @@
76 #if HAVE_SYS_MKDEV_H
77 #include <sys/mkdev.h>
78 #endif
79+#ifdef HAVE_SYS_SYSMACROS_H
80+#include <sys/sysmacros.h>
81+#endif
82
83 #include "ext2_fs.h"
84 #include "ext2fs.h"
85diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
86index e0f69dd..7404996 100644
87--- a/lib/ext2fs/ismounted.c
88+++ b/lib/ext2fs/ismounted.c
89@@ -49,6 +49,9 @@
90 #if HAVE_SYS_TYPES_H
91 #include <sys/types.h>
92 #endif
93+#ifdef HAVE_SYS_SYSMACROS_H
94+#include <sys/sysmacros.h>
95+#endif
96
97 #include "ext2_fs.h"
98 #include "ext2fs.h"
99diff --git a/misc/create_inode.c b/misc/create_inode.c
100index 4dbd8e5..98aeb41 100644
101--- a/misc/create_inode.c
102+++ b/misc/create_inode.c
103@@ -22,6 +22,10 @@
104 #include <attr/xattr.h>
105 #endif
106 #include <sys/ioctl.h>
107+#ifdef HAVE_SYS_SYSMACROS_H
108+#include <sys/sysmacros.h>
109+#endif
110+
111 #include <ext2fs/ext2fs.h>
112 #include <ext2fs/ext2_types.h>
113 #include <ext2fs/fiemap.h>
114diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
115index 71a15c5..00e95cd 100644
116--- a/misc/mk_hugefiles.c
117+++ b/misc/mk_hugefiles.c
118@@ -35,6 +35,9 @@ extern int optind;
119 #include <sys/ioctl.h>
120 #include <sys/types.h>
121 #include <sys/stat.h>
122+#ifdef HAVE_SYS_SYSMACROS_H
123+#include <sys/sysmacros.h>
124+#endif
125 #include <libgen.h>
126 #include <limits.h>
127 #include <blkid/blkid.h>
128--
1292.8.2
130
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
index 4b06b189b0..95ebc3a556 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb
@@ -7,6 +7,7 @@ SRC_URI += "file://acinclude.m4 \
7 file://ptest.patch \ 7 file://ptest.patch \
8 file://mkdir.patch \ 8 file://mkdir.patch \
9 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ 9 file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \
10 file://e2fsprogs-1.43-sysmacros.patch \
10" 11"
11 12
12SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" 13SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch"