diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-04-11 11:08:20 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-04-11 11:08:20 +0000 |
| commit | c917bf85ab4229246c87aef2cbd4669adb36fd92 (patch) | |
| tree | 3f702b3558039d9495b429b69911f54694ba77fc /meta/packages/util-linux/files/glibc-fix.patch | |
| parent | 5fc01adae4a49cfd0754e53962fd1e4913a6220f (diff) | |
| download | poky-c917bf85ab4229246c87aef2cbd4669adb36fd92.tar.gz | |
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.patch | 22 |
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 0000000000..6d0c2fcefa --- /dev/null +++ b/meta/packages/util-linux/files/glibc-fix.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | --- /tmp/cmos.c 2006-11-21 11:38:55.000000000 +0100 | ||
| 2 | +++ util-linux-2.12r/hwclock/cmos.c 2006-11-21 11:41:45.458554000 +0100 | ||
| 3 | @@ -46,15 +46,16 @@ | ||
| 4 | |||
| 5 | #include <unistd.h> /* for geteuid() */ | ||
| 6 | #include <fcntl.h> /* for O_RDWR */ | ||
| 7 | +#include <linux/version.h> | ||
| 8 | #include <errno.h> | ||
| 9 | #include "../defines.h" /* for HAVE_sys_io_h */ | ||
| 10 | #include "nls.h" | ||
| 11 | |||
| 12 | #if defined(__i386__) | ||
| 13 | -#ifdef HAVE_sys_io_h | ||
| 14 | -#include <sys/io.h> | ||
| 15 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) | ||
| 16 | +#include <asm/io.h> | ||
| 17 | #else | ||
| 18 | -#include <asm/io.h> /* for inb, outb */ | ||
| 19 | +#include <sys/io.h> /* for inb, outb */ | ||
| 20 | #endif | ||
| 21 | #elif defined(__alpha__) | ||
| 22 | /* <asm/io.h> fails to compile, probably because of u8 etc */ | ||