summaryrefslogtreecommitdiff
path: root/meta/packages/util-linux/files/glibc-fix.patch
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-04-11 11:08:20 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-04-11 11:08:20 +0000
commitc917bf85ab4229246c87aef2cbd4669adb36fd92 (patch)
tree3f702b3558039d9495b429b69911f54694ba77fc /meta/packages/util-linux/files/glibc-fix.patch
parent5fc01adae4a49cfd0754e53962fd1e4913a6220f (diff)
downloadopenembedded-core-c917bf85ab4229246c87aef2cbd4669adb36fd92.tar.gz
openembedded-core-c917bf85ab4229246c87aef2cbd4669adb36fd92.tar.bz2
openembedded-core-c917bf85ab4229246c87aef2cbd4669adb36fd92.tar.xz
openembedded-core-c917bf85ab4229246c87aef2cbd4669adb36fd92.zip
util-linux: added 2.12r from OE (needed by fakeroot)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1478 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/util-linux/files/glibc-fix.patch')
-rw-r--r--meta/packages/util-linux/files/glibc-fix.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/packages/util-linux/files/glibc-fix.patch b/meta/packages/util-linux/files/glibc-fix.patch
new file mode 100644
index 000000000..6d0c2fcef
--- /dev/null
+++ b/meta/packages/util-linux/files/glibc-fix.patch
@@ -0,0 +1,22 @@
+--- /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 */