diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2017-02-22 21:02:32 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 12:54:18 +0000 |
| commit | 383d1398b27705ee94523068fae2db961d365652 (patch) | |
| tree | 9420f1cb984cc5a3419f8d6c26548ea5074435b4 /meta/recipes-devtools/syslinux | |
| parent | 792568406f49be7a83cf7f69af3a17abd46adc7c (diff) | |
| download | openembedded-core-contrib-383d1398b27705ee94523068fae2db961d365652.tar.gz | |
syslinux: fix build with glibc-2.25
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/syslinux')
| -rw-r--r-- | meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch | 45 | ||||
| -rw-r--r-- | meta/recipes-devtools/syslinux/syslinux_6.03.bb | 1 |
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 @@ +https://bugs.gentoo.org/579928 + +From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Tue, 19 Apr 2016 01:56:41 -0400 +Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev + +These functions are defined in sys/sysmacros.h, so add the include to +main.c. This is already handled correctly in mountinfo.c. Otherwise +we get build failures like: + +main.o: In function 'find_device_sysfs': +extlinux/main.c:1131: undefined reference to 'minor' + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Mike Frysinger <vapier@gentoo.org> + +The first part wasn't enough in OE build, I had to add the same for syslinuxext.c. +--- + extlinux/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/extlinux/main.c b/extlinux/main.c +index a7ebd49..ebff7ea 100644 +--- a/extlinux/main.c ++++ b/extlinux/main.c +@@ -38,6 +38,7 @@ + #include <sysexits.h> + #include <sys/ioctl.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/mount.h> + #include <sys/vfs.h> +--- a/libinstaller/syslinuxext.c 2017-02-22 20:17:05.336869181 +0100 ++++ b/libinstaller/syslinuxext.c 2017-02-22 20:16:47.500868751 +0100 +@@ -2,6 +2,7 @@ + + #include <sys/stat.h> + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <getopt.h> + #include <ext2fs/ext2fs.h> + 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 \ file://0009-linux-syslinux-implement-install_bootblock.patch \ file://0010-gcc46-compatibility.patch \ file://0011-mk-MMD-does-not-take-any-arguments.patch \ + file://syslinux-6.03-sysmacros.patch \ " SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" |