diff options
| author | Ross Burton <ross.burton@intel.com> | 2019-06-07 18:53:48 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-08 16:01:41 +0100 |
| commit | 946a8802be344ac7ef409ac687fc383c2a6a8684 (patch) | |
| tree | c770d9b89250517a7ae7e2633099a85ed4de9d50 | |
| parent | 939a61c5dcaff3e56cec1dcda01d27ca57154f78 (diff) | |
| download | poky-946a8802be344ac7ef409ac687fc383c2a6a8684.tar.gz | |
parted: drop patch for linux <2.6.20 support
We don't really care about kernels this old anymore, so drop the patch.
(From OE-Core rev: b9630048451342a0ca1080955b0df35b0c94ce46)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/parted/files/syscalls.patch | 55 | ||||
| -rw-r--r-- | meta/recipes-extended/parted/parted_3.2.bb | 1 |
2 files changed, 0 insertions, 56 deletions
diff --git a/meta/recipes-extended/parted/files/syscalls.patch b/meta/recipes-extended/parted/files/syscalls.patch deleted file mode 100644 index 93205a0a80..0000000000 --- a/meta/recipes-extended/parted/files/syscalls.patch +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | --- | ||
| 4 | libparted/arch/linux.c | 13 +++++++++++++ | ||
| 5 | 1 file changed, 13 insertions(+) | ||
| 6 | |||
| 7 | Index: parted-3.2/libparted/arch/linux.c | ||
| 8 | =================================================================== | ||
| 9 | --- parted-3.2.orig/libparted/arch/linux.c | ||
| 10 | +++ parted-3.2/libparted/arch/linux.c | ||
| 11 | @@ -17,6 +17,8 @@ | ||
| 12 | |||
| 13 | #define PROC_DEVICES_BUFSIZ 16384 | ||
| 14 | |||
| 15 | +#include <linux/version.h> | ||
| 16 | + | ||
| 17 | #include <config.h> | ||
| 18 | #include <arch/linux.h> | ||
| 19 | #include <linux/blkpg.h> | ||
| 20 | @@ -1696,12 +1698,14 @@ linux_refresh_close (PedDevice* dev) | ||
| 21 | |||
| 22 | #if SIZEOF_OFF_T < 8 | ||
| 23 | |||
| 24 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) | ||
| 25 | static _syscall5(int,_llseek, | ||
| 26 | unsigned int, fd, | ||
| 27 | unsigned long, offset_high, | ||
| 28 | unsigned long, offset_low, | ||
| 29 | loff_t*, result, | ||
| 30 | unsigned int, origin) | ||
| 31 | +#endif | ||
| 32 | |||
| 33 | loff_t | ||
| 34 | llseek (unsigned int fd, loff_t offset, unsigned int whence) | ||
| 35 | @@ -1709,11 +1713,20 @@ llseek (unsigned int fd, loff_t offset, | ||
| 36 | loff_t result; | ||
| 37 | int retval; | ||
| 38 | |||
| 39 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) | ||
| 40 | retval = _llseek(fd, | ||
| 41 | ((unsigned long long)offset) >> 32, | ||
| 42 | ((unsigned long long)offset) & 0xffffffff, | ||
| 43 | &result, | ||
| 44 | whence); | ||
| 45 | +#else | ||
| 46 | + retval = syscall(__NR__llseek, fd, | ||
| 47 | + ((unsigned long long)offset) >> 32, | ||
| 48 | + ((unsigned long long)offset) & 0xffffffff, | ||
| 49 | + &result, | ||
| 50 | + whence); | ||
| 51 | +#endif | ||
| 52 | + | ||
| 53 | return (retval==-1 ? (loff_t) retval : result); | ||
| 54 | } | ||
| 55 | |||
diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb index 63f9f204e7..13d7d6676c 100644 --- a/meta/recipes-extended/parted/parted_3.2.bb +++ b/meta/recipes-extended/parted/parted_3.2.bb | |||
| @@ -8,7 +8,6 @@ PR = "r1" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ | 9 | SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ |
| 10 | file://no_check.patch \ | 10 | file://no_check.patch \ |
| 11 | file://syscalls.patch \ | ||
| 12 | file://fix-doc-mandir.patch \ | 11 | file://fix-doc-mandir.patch \ |
| 13 | file://fix-compile-failure-while-dis.patch \ | 12 | file://fix-compile-failure-while-dis.patch \ |
| 14 | file://0001-Include-fcntl.h-in-platform_defs.h.patch \ | 13 | file://0001-Include-fcntl.h-in-platform_defs.h.patch \ |
