mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
939a61c5dc
commit
946a8802be
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user