diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-12-06 13:28:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-12 21:50:08 +0000 |
commit | 3a401ddce55e185c8ccfdc43c1440fd77daff9ae (patch) | |
tree | 19e50aaa919fb1a796b189f85f380e6b638bd529 /meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch | |
parent | 9b3991cf6a8bb751e45c1abfc48d65d952c048b8 (diff) | |
download | openembedded-core-contrib-3a401ddce55e185c8ccfdc43c1440fd77daff9ae.tar.gz |
dosfstools: update native to 2.11
This unify recipes for target and native builds and also drops the the
already merged patches.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch')
-rw-r--r-- | meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch b/meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch deleted file mode 100644 index 4460f0618d..0000000000 --- a/meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch +++ /dev/null @@ -1,72 +0,0 @@ -Only use the system's llseek(). - -Upstream-Status: Inappropriate [licensing] -We're tracking an old release of dosfstools due to licensing issues. - -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -Index: dosfstools-2.10/dosfsck/io.c -=================================================================== ---- dosfstools-2.10.orig/dosfsck/io.c 2007-06-07 16:15:52.000000000 +0200 -+++ dosfstools-2.10/dosfsck/io.c 2007-06-07 16:16:06.000000000 +0200 -@@ -42,28 +42,11 @@ - /* Use the _llseek system call directly, because there (once?) was a bug in - * the glibc implementation of it. */ - #include <linux/unistd.h> --#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ - /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ - static loff_t llseek( int fd, loff_t offset, int whence ) - { - return lseek(fd, offset, whence); - } --#else --# ifndef __NR__llseek --# error _llseek system call not present --# endif --static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo, -- loff_t *, res, uint, wh ); -- --static loff_t llseek( int fd, loff_t offset, int whence ) --{ -- loff_t actual; -- -- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0) -- return (loff_t)-1; -- return actual; --} --#endif - - - void fs_open(char *path,int rw) -Index: dosfstools-2.10/mkdosfs/mkdosfs.c -=================================================================== ---- dosfstools-2.10.orig/mkdosfs/mkdosfs.c 2007-06-07 16:15:11.000000000 +0200 -+++ dosfstools-2.10/mkdosfs/mkdosfs.c 2007-06-07 16:15:30.000000000 +0200 -@@ -116,27 +116,11 @@ - /* Use the _llseek system call directly, because there (once?) was a bug in - * the glibc implementation of it. */ - #include <linux/unistd.h> --#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__ - /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */ - static loff_t llseek( int fd, loff_t offset, int whence ) - { - return lseek(fd, offset, whence); - } --#else --# ifndef __NR__llseek --# error _llseek system call not present --# endif --static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo, -- loff_t *, res, uint, wh ); --static loff_t llseek( int fd, loff_t offset, int whence ) --{ -- loff_t actual; -- -- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0) -- return (loff_t)-1; -- return actual; --} --#endif - - #define ROUND_UP(value, divisor) (value + (divisor - (value % divisor))) / divisor - |