parted: fix build with glibc-2.25
PATCH 1/2 parted: fix build with glibc-2.25
Signed-off-by Martin Jansa <[email protected]>
--- .../parted/parted/parted-3.2-sysmacros.patch | 32 ++++++++++++++++++++++ meta/recipes-extended/parted/parted_3.2.bb | 1 + 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch
meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch new file +32 -0
@@ -0,0 +1,32 @@ +https://bugs.gentoo.org/580022 + +From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Tue, 21 Jun 2016 15:01:08 -0400 +Subject: [PATCH] include sysmacros.h for major/minor/makedev + +Linux C libs are moving away from including this header implicitly via +sys/types.h, so include it explicitly. + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <[email protected]> + +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 326b95619d31..e5c168be3c68 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -37,6 +37,7 @@ + #include <dirent.h> + #include <sys/ioctl.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/utsname.h> /* for uname() */ + #include <scsi/scsi.h> +-- +2.8.2 +
meta/recipes-extended/parted/parted_3.2.bb +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://fix-compile-failure-while-dis.patch \ file://0001-Include-fcntl.h-in-platform_defs.h.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://parted-3.2-sysmacros.patch \ file://run-ptest \ file://Makefile \ "
Signature · 1 line
2.11.1
PATCH 2/2 syslinux: fix build with glibc-2.25
Signed-off-by Martin Jansa <[email protected]>
--- .../syslinux/syslinux-6.03-sysmacros.patch | 45 ++++++++++++++++++++++ meta/recipes-devtools/syslinux/syslinux_6.03.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch
meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch new file +45 -0
@@ -0,0 +1,45 @@ +https://bugs.gentoo.org/579928 + +From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +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 <[email protected]> +Signed-off-by: Mike Frysinger <[email protected]> + +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> +
meta/recipes-devtools/syslinux/syslinux_6.03.bb +1 -0
@@ -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"
Signature · 1 line
2.11.1