summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2017-02-22 21:02:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:07 +0000
commit3b2d79971f81251a3d4ee467b7144ffd8d937fcc (patch)
tree4bd91e16fe61b2f878e3ce7e45c414c204cf249d /meta/recipes-devtools
parent6828b03ac5417d8a4436d986376d39e8e739b49d (diff)
downloadpoky-3b2d79971f81251a3d4ee467b7144ffd8d937fcc.tar.gz
syslinux: fix build with glibc-2.25
(From OE-Core rev: 383d1398b27705ee94523068fae2db961d365652) 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/syslinux/syslinux/syslinux-6.03-sysmacros.patch45
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_6.03.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch
new file mode 100644
index 0000000000..3ce46da103
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch
@@ -0,0 +1,45 @@
1https://bugs.gentoo.org/579928
2
3From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001
4From: Mike Frysinger <vapier@gentoo.org>
5Date: Tue, 19 Apr 2016 01:56:41 -0400
6Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
7
8These functions are defined in sys/sysmacros.h, so add the include to
9main.c. This is already handled correctly in mountinfo.c. Otherwise
10we get build failures like:
11
12main.o: In function 'find_device_sysfs':
13extlinux/main.c:1131: undefined reference to 'minor'
14
15Upstream-Status: Pending
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17Signed-off-by: Mike Frysinger <vapier@gentoo.org>
18
19The first part wasn't enough in OE build, I had to add the same for syslinuxext.c.
20---
21 extlinux/main.c | 1 +
22 1 file changed, 1 insertion(+)
23
24diff --git a/extlinux/main.c b/extlinux/main.c
25index a7ebd49..ebff7ea 100644
26--- a/extlinux/main.c
27+++ b/extlinux/main.c
28@@ -38,6 +38,7 @@
29 #include <sysexits.h>
30 #include <sys/ioctl.h>
31 #include <sys/stat.h>
32+#include <sys/sysmacros.h>
33 #include <sys/types.h>
34 #include <sys/mount.h>
35 #include <sys/vfs.h>
36--- a/libinstaller/syslinuxext.c 2017-02-22 20:17:05.336869181 +0100
37+++ b/libinstaller/syslinuxext.c 2017-02-22 20:16:47.500868751 +0100
38@@ -2,6 +2,7 @@
39
40 #include <sys/stat.h>
41 #include <sys/types.h>
42+#include <sys/sysmacros.h>
43 #include <getopt.h>
44 #include <ext2fs/ext2fs.h>
45
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
index ab8a51a23f..69bce1f8d7 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.03.bb
@@ -23,6 +23,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.xz \
23 file://0009-linux-syslinux-implement-install_bootblock.patch \ 23 file://0009-linux-syslinux-implement-install_bootblock.patch \
24 file://0010-gcc46-compatibility.patch \ 24 file://0010-gcc46-compatibility.patch \
25 file://0011-mk-MMD-does-not-take-any-arguments.patch \ 25 file://0011-mk-MMD-does-not-take-any-arguments.patch \
26 file://syslinux-6.03-sysmacros.patch \
26 " 27 "
27 28
28SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" 29SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13"