libxslt: add comment saying when a workaround can be removed
PATCH 1/3 libxslt: add comment saying when a workaround can be removed
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-support/libxslt/libxslt_1.1.33.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-support/libxslt/libxslt_1.1.33.bb +2 -1
@@ -21,8 +21,9 @@ BINCONFIG = "${bindir}/xslt-config" inherit autotools pkgconfig binconfig-disabled lib_package -# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { + # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. + # This can be removed when upgrading to 1.1.34. sed -i -e 's/ansidecl.h//' ${S}/configure.ac # The timestamps in the 1.1.28 tarball are messed up causing this file to
Signature · 1 line
2.11.0
PATCH 2/3 parted: swap patches for the commits that landed upstream
Several of the parted fixes are actually upstream in slightly different form.
Signed-off-by Ross Burton <[email protected]>
--- .../0001-Include-fcntl.h-in-platform_defs.h.patch | 34 +++++----- ...se-read-only-when-probing-devices-on-linu.patch | 44 ++++++------- ...x-Include-sys-sysmacros.h-for-major-macro.patch | 28 ++++++++ .../files/fix-compile-failure-while-dis.patch | 76 ++++++++++++++-------- .../parted/parted/parted-3.2-sysmacros.patch | 32 --------- meta/recipes-extended/parted/parted_3.2.bb | 2 +- 6 files changed, 119 insertions(+), 97 deletions(-) create mode 100644 meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch delete mode 100644 meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch
meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch +19 -15
@@ -1,29 +1,33 @@ -From d78dd087c4ec4715aab5fe115668e726046ecd76 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 13 Apr 2015 18:16:05 -0700 -Subject: [PATCH] Include fcntl.h in /platform_defs.h +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> -exposed when compiling using musl +From a3877115f1956949096d77aca5a703a47ed68397 Mon Sep 17 00:00:00 2001 +From: Felix Janda <[email protected]> +Date: Sun, 3 May 2015 10:33:31 +0200 +Subject: [PATCH] libparted/fs/xfs/platform_defs.h: Include <fcntl.h> for + loff_t -Upstream-Status: Pending +This is needed for compilation with musl libc -Signed-off-by: Khem Raj <[email protected]> +Suggested-by: Travis Tilley <[email protected]> + +Signed-off-by: Brian C. Lane <[email protected]> --- libparted/fs/xfs/platform_defs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h -index 2b55752..32bd3d3 100644 +index 2b55752..a6ec8fb 100644 --- a/libparted/fs/xfs/platform_defs.h +++ b/libparted/fs/xfs/platform_defs.h -@@ -42,6 +42,7 @@ +@@ -38,6 +38,7 @@ + #include <stdarg.h> + #include <assert.h> + #include <endian.h> ++#include <fcntl.h> + #include <stddef.h> #include <stdlib.h> #include <string.h> - #include <unistd.h> -+#include <fcntl.h> - #include <sys/param.h> - #include <sys/types.h> - -- -2.1.4 +2.11.0
meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch +21 -23
150 lines not on this page · raw message
meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch new file +28 -0
@@ -0,0 +1,28 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From 0b72b8eb41438b62eeb9e3548b0b8f3094a78681 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" <[email protected]> +Date: Sat, 24 Mar 2018 17:37:02 +0000 +Subject: [PATCH] linux: Include <sys/sysmacros.h> for major() macro. + +Since glibc 2.27 this header is required. +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 0f18904..a15854f 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -41,6 +41,7 @@ + #include <sys/utsname.h> /* for uname() */ + #include <scsi/scsi.h> + #include <assert.h> ++#include <sys/sysmacros.h> + #ifdef ENABLE_DEVICE_MAPPER + #include <libdevmapper.h> + #endif +-- +2.11.0 +
meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch +50 -26
99 lines not on this page · raw message
meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch deleted +0 -32
@@ -1,32 +0,0 @@ -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 -1
@@ -15,7 +15,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \ - file://parted-3.2-sysmacros.patch \ + file://0001-linux-Include-sys-sysmacros.h-for-major-macro.patch \ file://run-ptest \ file://Makefile \ file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \
Signature · 1 line
2.11.0
PATCH 3/3 parted: drop patch for linux <2.6.20 support
In reply to Ross BurtonWe don't really care about kernels this old anymore, so drop the patch.
Signed-off-by Ross Burton <[email protected]>
--- meta/recipes-extended/parted/files/syscalls.patch | 55 ----------------------- meta/recipes-extended/parted/parted_3.2.bb | 1 - 2 files changed, 56 deletions(-) delete mode 100644 meta/recipes-extended/parted/files/syscalls.patch
meta/recipes-extended/parted/files/syscalls.patch deleted +0 -55
@@ -1,55 +0,0 @@ -Upstream-Status: Pending - ---- - libparted/arch/linux.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -Index: parted-3.2/libparted/arch/linux.c -=================================================================== ---- parted-3.2.orig/libparted/arch/linux.c -+++ parted-3.2/libparted/arch/linux.c -@@ -17,6 +17,8 @@ - - #define PROC_DEVICES_BUFSIZ 16384 - -+#include <linux/version.h> -+ - #include <config.h> - #include <arch/linux.h> - #include <linux/blkpg.h> -@@ -1696,12 +1698,14 @@ linux_refresh_close (PedDevice* dev) - - #if SIZEOF_OFF_T < 8 - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - static _syscall5(int,_llseek, - unsigned int, fd, - unsigned long, offset_high, - unsigned long, offset_low, - loff_t*, result, - unsigned int, origin) -+#endif - - loff_t - llseek (unsigned int fd, loff_t offset, unsigned int whence) -@@ -1709,11 +1713,20 @@ llseek (unsigned int fd, loff_t offset, - loff_t result; - int retval; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - retval = _llseek(fd, - ((unsigned long long)offset) >> 32, - ((unsigned long long)offset) & 0xffffffff, - &result, - whence); -+#else -+ retval = syscall(__NR__llseek, fd, -+ ((unsigned long long)offset) >> 32, -+ ((unsigned long long)offset) & 0xffffffff, -+ &result, -+ whence); -+#endif -+ - return (retval==-1 ? (loff_t) retval : result); - } -
meta/recipes-extended/parted/parted_3.2.bb +0 -1
@@ -8,7 +8,6 @@ PR = "r1" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://no_check.patch \ - file://syscalls.patch \ file://fix-doc-mandir.patch \ file://fix-compile-failure-while-dis.patch \ file://0001-Include-fcntl.h-in-platform_defs.h.patch \
Signature · 1 line
2.11.0