[oe-commits] org.oe.dev util-linux: add debian patch and patches from #1533, courtesy Gerwin van der Kruis, should close #1533

[koen commit]

util-linux: add debian patch and patches from #1533, courtesy Gerwin van der Kruis, should close #1533

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 83d79b5cd4fd20054c665e25366f4ee45f3b681f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=83d79b5cd4fd20054c665e25366f4ee45f3b681f
Files:
1
packages/util-linux/files/glibc-fix.patch
packages/util-linux/files/util-linux_2.12r-12.diff.gz
packages/util-linux/util-linux_2.12r.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r0aadd762e26905515015bfe5e0e827a34240e6e2 -r83d79b5cd4fd20054c665e25366f4ee45f3b681f
#
# 
# 
# add_file "packages/util-linux/files/glibc-fix.patch"
#  content [1a9c489969dc7f1edb739691a9634f57b236104a]
# 
# add_file "packages/util-linux/files/util-linux_2.12r-12.diff.gz"
#  content [a29494185607aba7e5f75cfc07474dcbff118f9f]
# 
# patch "packages/util-linux/util-linux_2.12r.bb"
#  from [93fd5c6aa91d9cf854c3999ae72e855e9125d48f]
#    to [3925c575694ba9a5b31b7485c6976a3cdde7fae5]
# 
#   set "packages/util-linux/files/util-linux_2.12r-12.diff.gz"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
--- packages/util-linux/files/glibc-fix.patch	1a9c489969dc7f1edb739691a9634f57b236104a
+++ packages/util-linux/files/glibc-fix.patch	1a9c489969dc7f1edb739691a9634f57b236104a
@@ -0,0 +1,62 @@
+--- /tmp/llseek.c	2006-11-21 11:31:31.000000000 +0100
++++ util-linux-2.12r/fdisk/llseek.c	2006-11-21 11:33:21.218554000 +0100
+@@ -31,9 +31,18 @@
+ 
+ #ifdef __NR__llseek
+ 
++#ifdef _syscall5
++
+ static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
+ 		 unsigned long, offset_low,long long *,result,
+ 		 unsigned int, origin)
++#else
++static int _llseek (unsigned int fd, unsigned long oh,
++                   unsigned long ol, long long *result,
++                   unsigned int origin) {
++       return syscall (__NR__llseek, fd, oh, ol, result, origin);
++}
++#endif /* _syscall5 */
+ 
+ #else
+ 
+--- /tmp/sfdisk.c	2006-11-21 11:36:13.000000000 +0100
++++ util-linux-2.12r/fdisk/sfdisk.c	2006-11-21 11:37:17.678554000 +0100
+@@ -177,9 +177,16 @@
+ #endif
+ 
+ #ifndef use_lseek
++#ifdef _syscall5
+ static __attribute__used
+ _syscall5(int,  _llseek,  unsigned int,  fd, ulong, hi, ulong, lo,
+        loff_t *, res, unsigned int, wh);
++#else
++int _llseek (unsigned int fd, ulong hi, ulong lo,
++       loff_t *res, unsigned int wh) {
++       return syscall (__NR__llseek, fd, hi, lo, res, wh);
++}
++#endif /* _syscall5 */
+ #endif
+ 
+ static int
+--- /tmp/cmos.c	2006-11-21 11:38:55.000000000 +0100
++++ util-linux-2.12r/hwclock/cmos.c	2006-11-21 11:41:45.458554000 +0100
+@@ -46,15 +46,16 @@
+ 
+ #include <unistd.h>		/* for geteuid() */
+ #include <fcntl.h>		/* for O_RDWR */
++#include <linux/version.h>
+ #include <errno.h>
+ #include "../defines.h"		/* for HAVE_sys_io_h */
+ #include "nls.h"
+ 
+ #if defined(__i386__)
+-#ifdef HAVE_sys_io_h
+-#include <sys/io.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
++#include <asm/io.h>
+ #else
+-#include <asm/io.h>		/* for inb, outb */
++#include <sys/io.h>		/* for inb, outb */
+ #endif
+ #elif defined(__alpha__)
+ /* <asm/io.h> fails to compile, probably because of u8 etc */
============================================================
# packages/util-linux/files/util-linux_2.12r-12.diff.gz is binary
============================================================
--- packages/util-linux/util-linux_2.12r.bb	93fd5c6aa91d9cf854c3999ae72e855e9125d48f
+++ packages/util-linux/util-linux_2.12r.bb	3925c575694ba9a5b31b7485c6976a3cdde7fae5
@@ -1,3 +1,6 @@ require util-linux.inc
 require util-linux.inc
 
+SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
+SRC_URI += "file://glibc-fix.patch;patch=1"
+
+PR = "r10"
-PR = "r8"