diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-23 10:40:10 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-23 10:40:10 +0000 |
| commit | 6c2668f8ff64ba468ecc69d69109b8fde0eab6ea (patch) | |
| tree | 7ff4b93a66ee42105c991d13e05d3ea996dff471 /packages/util-linux/util-linux-2.12 | |
| parent | 0bba72b98ee6d482560929303f4657d445a4034d (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/05/23 12:35:36+02:00 hrw.one.pl!hrw
unified build of util-linux
added util-linux 2.12q
BKrev: 4291b30aD33dzLe0vcsmWcJUi-X2tQ
Diffstat (limited to 'packages/util-linux/util-linux-2.12')
| -rw-r--r-- | packages/util-linux/util-linux-2.12/ioctl.diff | 52 | ||||
| -rw-r--r-- | packages/util-linux/util-linux-2.12/my_dev_t.h.diff | 8 | ||||
| -rw-r--r-- | packages/util-linux/util-linux-2.12/pagesz-not-constant.patch | 0 |
3 files changed, 60 insertions, 0 deletions
diff --git a/packages/util-linux/util-linux-2.12/ioctl.diff b/packages/util-linux/util-linux-2.12/ioctl.diff index e69de29bb2..06cf9c02d9 100644 --- a/packages/util-linux/util-linux-2.12/ioctl.diff +++ b/packages/util-linux/util-linux-2.12/ioctl.diff @@ -0,0 +1,52 @@ +diff -Naur util-linux-2.12/disk-utils/blockdev.c util-linux-2.12-ok/disk-utils/blockdev.c +--- util-linux-2.12/disk-utils/blockdev.c 2002-03-08 23:57:02.000000000 +0100 ++++ util-linux-2.12-ok/disk-utils/blockdev.c 2004-11-09 14:21:13.000000000 +0100 +@@ -24,8 +24,8 @@ + #define BLKRASET _IO(0x12,98) + #define BLKRAGET _IO(0x12,99) + #define BLKSSZGET _IO(0x12,104) +-#define BLKBSZGET _IOR(0x12,112,sizeof(int)) +-#define BLKBSZSET _IOW(0x12,113,sizeof(int)) ++#define BLKBSZGET _IOR(0x12,112,int) ++#define BLKBSZSET _IOW(0x12,113,int) + #endif + + /* Maybe <linux/hdreg.h> could be included */ +diff -Naur util-linux-2.12/disk-utils/elvtune.c util-linux-2.12-ok/disk-utils/elvtune.c +--- util-linux-2.12/disk-utils/elvtune.c 2002-03-08 23:57:49.000000000 +0100 ++++ util-linux-2.12-ok/disk-utils/elvtune.c 2004-11-09 14:21:44.000000000 +0100 +@@ -37,8 +37,8 @@ + int max_bomb_segments; + } blkelv_ioctl_arg_t; + +-#define BLKELVGET _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t)) +-#define BLKELVSET _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t)) ++#define BLKELVGET _IOR(0x12,106,blkelv_ioctl_arg_t) ++#define BLKELVSET _IOW(0x12,107,blkelv_ioctl_arg_t) + + static void + usage(void) { +diff -Naur util-linux-2.12/fdisk/common.h util-linux-2.12-ok/fdisk/common.h +--- util-linux-2.12/fdisk/common.h 2003-07-13 15:59:53.000000000 +0200 ++++ util-linux-2.12-ok/fdisk/common.h 2004-11-09 14:37:41.000000000 +0100 +@@ -6,7 +6,7 @@ + #define BLKGETSIZE _IO(0x12,96) /* return device size */ + #define BLKFLSBUF _IO(0x12,97) /* flush buffer cache */ + #define BLKSSZGET _IO(0x12,104) /* get block device sector size */ +-#define BLKGETSIZE64 _IOR(0x12,114,8) /* 8 = sizeof(u64) */ ++#define BLKGETSIZE64 _IOR(0x12,114,unsigned long long)/* 8 = sizeof(u64) */ + + /* including <linux/hdreg.h> also fails */ + struct hd_geometry { +diff -Naur util-linux-2.12/partx/gpt.c util-linux-2.12-ok/partx/gpt.c +--- util-linux-2.12/partx/gpt.c 2002-08-04 02:20:16.000000000 +0200 ++++ util-linux-2.12-ok/partx/gpt.c 2004-11-09 14:23:18.000000000 +0100 +@@ -41,7 +41,7 @@ + #define BLKGETLASTSECT _IO(0x12,108) /* get last sector of block device */ + #define BLKGETSIZE _IO(0x12,96) /* return device size */ + #define BLKSSZGET _IO(0x12,104) /* get block device sector size */ +-#define BLKGETSIZE64 _IOR(0x12,114,sizeof(uint64_t)) /* return device size in bytes (u64 *arg) */ ++#define BLKGETSIZE64 _IOR(0x12,114,uint64_t) /* return device size in bytes (u64 *arg) */ + + struct blkdev_ioctl_param { + unsigned int block; diff --git a/packages/util-linux/util-linux-2.12/my_dev_t.h.diff b/packages/util-linux/util-linux-2.12/my_dev_t.h.diff index e69de29bb2..ebb7033fa8 100644 --- a/packages/util-linux/util-linux-2.12/my_dev_t.h.diff +++ b/packages/util-linux/util-linux-2.12/my_dev_t.h.diff @@ -0,0 +1,8 @@ +--- util-linux-2.12.orig/mount/my_dev_t.h ++++ util-linux-2.12/mount/my_dev_t.h +@@ -4,4 +4,4 @@ + /* for ancient systems use "unsigned short" */ + + #include <linux/posix_types.h> +-#define my_dev_t __kernel_dev_t ++#define my_dev_t __kernel_old_dev_t diff --git a/packages/util-linux/util-linux-2.12/pagesz-not-constant.patch b/packages/util-linux/util-linux-2.12/pagesz-not-constant.patch deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/util-linux/util-linux-2.12/pagesz-not-constant.patch +++ /dev/null |