[oe-commits] org.oe.dev dosfstools: merge 2.6.20 syscalls patch from Poky

[hrw commit]

dosfstools: merge 2.6.20 syscalls patch from Poky

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: de64b3463c97a3295d0c0973a3b49b728f09fc57
ViewMTN: http://monotone.openembedded.org/revision/info/de64b3463c97a3295d0c0973a3b49b728f09fc57
Files:
1
packages/dosfstools/files/2.6.20-syscall.patch
packages/dosfstools/dosfstools-native_2.10.bb
Diffs:

#
# mt diff -r749ce1c0785189704eea571053625227c9d6994a -rde64b3463c97a3295d0c0973a3b49b728f09fc57
#
#
#
# add_file "packages/dosfstools/files/2.6.20-syscall.patch"
#  content [d16fa45896b2fa1a24df86947a8748d591cb2857]
# 
# patch "packages/dosfstools/dosfstools-native_2.10.bb"
#  from [74f77d7777f1859ca6103dda2b291c4ba8081da8]
#    to [b4d20dfdf25b3e72471114ea9213d8a8eec2b1c9]
#
============================================================
--- packages/dosfstools/files/2.6.20-syscall.patch	d16fa45896b2fa1a24df86947a8748d591cb2857
+++ packages/dosfstools/files/2.6.20-syscall.patch	d16fa45896b2fa1a24df86947a8748d591cb2857
@@ -0,0 +1,65 @@
+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
+ 
============================================================
--- packages/dosfstools/dosfstools-native_2.10.bb	74f77d7777f1859ca6103dda2b291c4ba8081da8
+++ packages/dosfstools/dosfstools-native_2.10.bb	b4d20dfdf25b3e72471114ea9213d8a8eec2b1c9
@@ -7,7 +7,7 @@ S="${WORKDIR}/dosfstools-${PV}"
 
 S="${WORKDIR}/dosfstools-${PV}"
 
-PR="r3"
+PR="r4"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
 	file://mkdosfs-bootcode.patch;patch=1 \
@@ -16,7 +16,8 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub
 	file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
 	file://msdos_fat12_undefined.patch;patch=1 \
 	file://dosfstools-msdos_fs-types.patch;patch=1 \
-	file://include-linux-types.patch;patch=1"
+	file://include-linux-types.patch;patch=1 \
+	file://2.6.20-syscall.patch;patch=1"
 
 inherit native